From 48b936d7b7e624e04c6a85e110b10bfb13363db6 Mon Sep 17 00:00:00 2001 From: l3d00m Date: Sun, 23 Aug 2015 21:12:30 +0200 Subject: [PATCH 1/5] More lint fixes --- .../QKSMS/common/utils/DateFormatterTest.java | 6 +- .../java/android/annotation/SdkConstant.java | 2 +- .../android/location/CountryDetector.java | 2 +- .../java/android/net/DhcpInfoInternal.java | 2 +- .../android/net/IConnectivityManager.java | 2 +- .../android/net/INetworkPolicyListener.java | 2 +- .../android/net/INetworkPolicyManager.java | 2 +- .../java/android/net/LinkCapabilities.java | 8 +- .../main/java/android/net/LinkProperties.java | 27 ++-- .../main/java/android/net/NetworkPolicy.java | 12 +- .../java/android/net/ProxyProperties.java | 3 +- .../android/mms/dom/smil/ElementTimeImpl.java | 14 +- .../mms/dom/smil/SmilDocumentImpl.java | 45 +++--- .../mms/dom/smil/SmilParElementImpl.java | 2 +- .../com/android/mms/dom/smil/SmilPlayer.java | 14 +- .../sdk/EndlessJabberInterface.java | 4 +- .../QKSMS/common/google/CacheManager.java | 2 +- .../common/google/ImageCacheService.java | 4 +- .../QKSMS/common/google/ThumbnailManager.java | 2 +- .../com/moez/QKSMS/exif/ExifInterface.java | 6 +- .../ui/delivery/DeliveryReportHelper.java | 15 +- .../com/moez/QKSMS/ui/dialog/QKDialog.java | 4 +- .../QKSMS/ui/dialog/mms/QKDialogFragment.java | 2 +- .../QKSMS/ui/messagelist/MessageItem.java | 2 +- .../ui/messagelist/MessageListFragment.java | 4 +- .../moez/QKSMS/ui/mms/SlideshowActivity.java | 2 +- .../moez/QKSMS/ui/search/SearchFragment.java | 2 +- .../QKSMS/ui/settings/SettingsFragment.java | 140 ++++++++++-------- .../welcome/DemoConversationCursorLoader.java | 6 +- .../QKSMS/ui/welcome/WelcomeActivity.java | 2 +- 30 files changed, 173 insertions(+), 167 deletions(-) diff --git a/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java index 95f1aa8c..256d4b79 100644 --- a/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java +++ b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java @@ -2,13 +2,11 @@ package com.moez.QKSMS.common.utils; import android.content.SharedPreferences; import android.test.AndroidTestCase; -import android.util.Log; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.settings.SettingsFragment; import java.text.SimpleDateFormat; -import java.util.Locale; public class DateFormatterTest extends AndroidTestCase { protected void setUp() throws Exception { @@ -17,9 +15,9 @@ public class DateFormatterTest extends AndroidTestCase { public void test24Hours(){ SharedPreferences prefs = MainActivity.getPrefs(getContext()); - prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, true).commit(); + prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, true).apply(); assertTrue(DateFormatter.accountFor24HourTime(getContext(), new SimpleDateFormat("h:mm a")).equals(new SimpleDateFormat("H:mm"))); - prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, false).commit(); + prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, false).apply(); } public void testDateSymbolsAPI(){ diff --git a/QKSMS/src/main/java/android/annotation/SdkConstant.java b/QKSMS/src/main/java/android/annotation/SdkConstant.java index fb97a27c..8fcefb57 100644 --- a/QKSMS/src/main/java/android/annotation/SdkConstant.java +++ b/QKSMS/src/main/java/android/annotation/SdkConstant.java @@ -29,7 +29,7 @@ import java.lang.annotation.Target; @Target({ElementType.FIELD}) @Retention(RetentionPolicy.SOURCE) public @interface SdkConstant { - public static enum SdkConstantType { + public enum SdkConstantType { ACTIVITY_INTENT_ACTION, BROADCAST_INTENT_ACTION, SERVICE_ACTION, INTENT_CATEGORY, FEATURE } diff --git a/QKSMS/src/main/java/android/location/CountryDetector.java b/QKSMS/src/main/java/android/location/CountryDetector.java index 4ea6e9c6..a90a3185 100644 --- a/QKSMS/src/main/java/android/location/CountryDetector.java +++ b/QKSMS/src/main/java/android/location/CountryDetector.java @@ -90,7 +90,7 @@ public class CountryDetector { */ public CountryDetector(ICountryDetector service) { mService = service; - mListeners = new HashMap(); + mListeners = new HashMap<>(); } /** diff --git a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java index f4d7b2a6..8e4e6da5 100644 --- a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java +++ b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java @@ -53,7 +53,7 @@ public class DhcpInfoInternal { private Collection mRoutes; public DhcpInfoInternal() { - mRoutes = new ArrayList(); + mRoutes = new ArrayList<>(); } public void addRoute(RouteInfo routeInfo) { diff --git a/QKSMS/src/main/java/android/net/IConnectivityManager.java b/QKSMS/src/main/java/android/net/IConnectivityManager.java index a98252cd..7203366a 100644 --- a/QKSMS/src/main/java/android/net/IConnectivityManager.java +++ b/QKSMS/src/main/java/android/net/IConnectivityManager.java @@ -1387,7 +1387,7 @@ public interface IConnectivityManager extends android.os.IInterface { } } - static final int TRANSACTION_setNetworkPreference = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0); + static final int TRANSACTION_setNetworkPreference = (android.os.IBinder.FIRST_CALL_TRANSACTION); static final int TRANSACTION_getNetworkPreference = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1); static final int TRANSACTION_getActiveNetworkInfo = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2); static final int TRANSACTION_getActiveNetworkInfoForUid = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3); diff --git a/QKSMS/src/main/java/android/net/INetworkPolicyListener.java b/QKSMS/src/main/java/android/net/INetworkPolicyListener.java index 4404103d..a8b331e1 100644 --- a/QKSMS/src/main/java/android/net/INetworkPolicyListener.java +++ b/QKSMS/src/main/java/android/net/INetworkPolicyListener.java @@ -125,7 +125,7 @@ public interface INetworkPolicyListener extends android.os.IInterface { } } - static final int TRANSACTION_onUidRulesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0); + static final int TRANSACTION_onUidRulesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION); static final int TRANSACTION_onMeteredIfacesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1); static final int TRANSACTION_onRestrictBackgroundChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2); } diff --git a/QKSMS/src/main/java/android/net/INetworkPolicyManager.java b/QKSMS/src/main/java/android/net/INetworkPolicyManager.java index 154ce17e..06134524 100644 --- a/QKSMS/src/main/java/android/net/INetworkPolicyManager.java +++ b/QKSMS/src/main/java/android/net/INetworkPolicyManager.java @@ -439,7 +439,7 @@ public interface INetworkPolicyManager extends android.os.IInterface { } } - static final int TRANSACTION_setUidPolicy = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0); + static final int TRANSACTION_setUidPolicy = (android.os.IBinder.FIRST_CALL_TRANSACTION); static final int TRANSACTION_getUidPolicy = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1); static final int TRANSACTION_getUidsWithPolicy = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2); static final int TRANSACTION_isUidForeground = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3); diff --git a/QKSMS/src/main/java/android/net/LinkCapabilities.java b/QKSMS/src/main/java/android/net/LinkCapabilities.java index 58ad1593..c4e20cb9 100644 --- a/QKSMS/src/main/java/android/net/LinkCapabilities.java +++ b/QKSMS/src/main/java/android/net/LinkCapabilities.java @@ -199,7 +199,7 @@ public class LinkCapabilities implements Parcelable { * Constructor */ public LinkCapabilities() { - mCapabilities = new HashMap(); + mCapabilities = new HashMap<>(); } /** @@ -209,9 +209,9 @@ public class LinkCapabilities implements Parcelable { */ public LinkCapabilities(LinkCapabilities source) { if (source != null) { - mCapabilities = new HashMap(source.mCapabilities); + mCapabilities = new HashMap<>(source.mCapabilities); } else { - mCapabilities = new HashMap(); + mCapabilities = new HashMap<>(); } } @@ -356,7 +356,7 @@ public class LinkCapabilities implements Parcelable { public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mCapabilities.size()); for (Entry entry : mCapabilities.entrySet()) { - dest.writeInt(entry.getKey().intValue()); + dest.writeInt(entry.getKey()); dest.writeString(entry.getValue()); } } diff --git a/QKSMS/src/main/java/android/net/LinkProperties.java b/QKSMS/src/main/java/android/net/LinkProperties.java index 87842c7b..bc0ec65d 100644 --- a/QKSMS/src/main/java/android/net/LinkProperties.java +++ b/QKSMS/src/main/java/android/net/LinkProperties.java @@ -52,14 +52,14 @@ import java.util.Collections; public class LinkProperties implements Parcelable { String mIfaceName; - private Collection mLinkAddresses = new ArrayList(); - private Collection mDnses = new ArrayList(); - private Collection mRoutes = new ArrayList(); + private Collection mLinkAddresses = new ArrayList<>(); + private Collection mDnses = new ArrayList<>(); + private Collection mRoutes = new ArrayList<>(); private ProxyProperties mHttpProxy; public static class CompareResult { - public Collection removed = new ArrayList(); - public Collection added = new ArrayList(); + public Collection removed = new ArrayList<>(); + public Collection added = new ArrayList<>(); @Override public String toString() { @@ -97,7 +97,7 @@ public class LinkProperties implements Parcelable { } public Collection getAddresses() { - Collection addresses = new ArrayList(); + Collection addresses = new ArrayList<>(); for (LinkAddress linkAddress : mLinkAddresses) { addresses.add(linkAddress.getAddress()); } @@ -192,8 +192,7 @@ public class LinkProperties implements Parcelable { public boolean isIdenticalAddresses(LinkProperties target) { Collection targetAddresses = target.getAddresses(); Collection sourceAddresses = getAddresses(); - return (sourceAddresses.size() == targetAddresses.size()) ? - sourceAddresses.containsAll(targetAddresses) : false; + return (sourceAddresses.size() == targetAddresses.size()) && sourceAddresses.containsAll(targetAddresses); } /** @@ -275,8 +274,8 @@ public class LinkProperties implements Parcelable { * are in target but not in mLinkAddresses are placed in the * addedAddresses. */ - CompareResult result = new CompareResult(); - result.removed = new ArrayList(mLinkAddresses); + CompareResult result = new CompareResult<>(); + result.removed = new ArrayList<>(mLinkAddresses); result.added.clear(); if (target != null) { for (LinkAddress newAddress : target.getLinkAddresses()) { @@ -305,9 +304,9 @@ public class LinkProperties implements Parcelable { * are in target but not in mDnses are placed in the * addedAddresses. */ - CompareResult result = new CompareResult(); + CompareResult result = new CompareResult<>(); - result.removed = new ArrayList(mDnses); + result.removed = new ArrayList<>(mDnses); result.added.clear(); if (target != null) { for (InetAddress newAddress : target.getDnses()) { @@ -335,9 +334,9 @@ public class LinkProperties implements Parcelable { * leaving the routes that are different. And route address which * are in target but not in mRoutes are placed in added. */ - CompareResult result = new CompareResult(); + CompareResult result = new CompareResult<>(); - result.removed = new ArrayList(mRoutes); + result.removed = new ArrayList<>(mRoutes); result.added.clear(); if (target != null) { for (RouteInfo r : target.getRoutes()) { diff --git a/QKSMS/src/main/java/android/net/NetworkPolicy.java b/QKSMS/src/main/java/android/net/NetworkPolicy.java index b718d52c..9d46b797 100644 --- a/QKSMS/src/main/java/android/net/NetworkPolicy.java +++ b/QKSMS/src/main/java/android/net/NetworkPolicy.java @@ -168,17 +168,7 @@ public class NetworkPolicy implements Parcelable, Comparable { @Override public String toString() { - final StringBuilder builder = new StringBuilder("NetworkPolicy"); - builder.append("[").append(template).append("]:"); - builder.append(" cycleDay=").append(cycleDay); - builder.append(", cycleTimezone=").append(cycleTimezone); - builder.append(", warningBytes=").append(warningBytes); - builder.append(", limitBytes=").append(limitBytes); - builder.append(", lastWarningSnooze=").append(lastWarningSnooze); - builder.append(", lastLimitSnooze=").append(lastLimitSnooze); - builder.append(", metered=").append(metered); - builder.append(", inferred=").append(inferred); - return builder.toString(); + return "NetworkPolicy" + "[" + template + "]:" + " cycleDay=" + cycleDay + ", cycleTimezone=" + cycleTimezone + ", warningBytes=" + warningBytes + ", limitBytes=" + limitBytes + ", lastWarningSnooze=" + lastWarningSnooze + ", lastLimitSnooze=" + lastLimitSnooze + ", metered=" + metered + ", inferred=" + inferred; } public static final Creator CREATOR = new Creator() { diff --git a/QKSMS/src/main/java/android/net/ProxyProperties.java b/QKSMS/src/main/java/android/net/ProxyProperties.java index 6a1e83fe..962a46c9 100644 --- a/QKSMS/src/main/java/android/net/ProxyProperties.java +++ b/QKSMS/src/main/java/android/net/ProxyProperties.java @@ -153,8 +153,7 @@ public class ProxyProperties implements Parcelable { return false; } if (mHost != null && p.mHost == null) return false; - if (mHost == null && p.mHost != null) return false; - return mPort == p.mPort; + return !(mHost == null && p.mHost != null) && mPort == p.mPort; } /** diff --git a/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java b/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java index 80dc5615..a3443cd8 100644 --- a/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java +++ b/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java @@ -72,11 +72,11 @@ public abstract class ElementTimeImpl implements ElementTime { String[] beginTimeStringList = mSmilElement.getAttribute("begin").split(";"); // TODO: Check other constraints on parsed values, e.g., "single, non-negative offset values - ArrayList