From 8f881e23b2be6a6cc351875fc2485fc42d28e97d Mon Sep 17 00:00:00 2001 From: l3d00m Date: Thu, 20 Aug 2015 19:29:46 +0200 Subject: [PATCH] Further lint cleanup --- .../java/android/annotation/SdkConstant.java | 2 +- .../java/android/net/ConnectivityManager.java | 5 +---- .../java/android/net/DhcpInfoInternal.java | 10 +++------- .../java/android/net/NetworkTemplate.java | 20 ++++--------------- .../java/android/net/ProxyProperties.java | 5 ++--- .../main/java/com/android/mms/MmsConfig.java | 2 -- .../main/java/com/moez/QKSMS/MmsConfig.java | 4 +--- .../moez/QKSMS/common/utils/MessageUtils.java | 7 ++----- .../com/moez/QKSMS/data/RecipientIdCache.java | 2 +- .../com/moez/QKSMS/exif/ExifInterface.java | 15 +++----------- .../java/com/moez/QKSMS/exif/ExifParser.java | 5 +---- .../java/com/moez/QKSMS/exif/ExifTag.java | 20 ++++--------------- .../java/com/moez/QKSMS/mmssms/Utils.java | 5 +---- .../ConversationListAdapter.java | 2 -- .../com/moez/QKSMS/ui/view/QKCheckBox.java | 1 - 15 files changed, 24 insertions(+), 81 deletions(-) diff --git a/QKSMS/src/main/java/android/annotation/SdkConstant.java b/QKSMS/src/main/java/android/annotation/SdkConstant.java index 06827a1f..fb97a27c 100644 --- a/QKSMS/src/main/java/android/annotation/SdkConstant.java +++ b/QKSMS/src/main/java/android/annotation/SdkConstant.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.SOURCE) public @interface SdkConstant { public static enum SdkConstantType { - ACTIVITY_INTENT_ACTION, BROADCAST_INTENT_ACTION, SERVICE_ACTION, INTENT_CATEGORY, FEATURE; + ACTIVITY_INTENT_ACTION, BROADCAST_INTENT_ACTION, SERVICE_ACTION, INTENT_CATEGORY, FEATURE } SdkConstantType value(); diff --git a/QKSMS/src/main/java/android/net/ConnectivityManager.java b/QKSMS/src/main/java/android/net/ConnectivityManager.java index 3d052b12..671ea25e 100644 --- a/QKSMS/src/main/java/android/net/ConnectivityManager.java +++ b/QKSMS/src/main/java/android/net/ConnectivityManager.java @@ -566,11 +566,8 @@ public class ConnectivityManager { public boolean requestRouteToHost(int networkType, int hostAddress) { InetAddress inetAddress = NetworkUtils.intToInetAddress(hostAddress); - if (inetAddress == null) { - return false; - } + return inetAddress != null && requestRouteToHostAddress(networkType, inetAddress); - return requestRouteToHostAddress(networkType, inetAddress); } /** diff --git a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java index d66c194e..f4d7b2a6 100644 --- a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java +++ b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java @@ -112,12 +112,12 @@ public class DhcpInfoInternal { p.addRoute(route); } //if empty, connectivity configures default DNS - if (TextUtils.isEmpty(dns1) == false) { + if (!TextUtils.isEmpty(dns1)) { p.addDns(NetworkUtils.numericToInetAddress(dns1)); } else { if (LOCAL_LOGV) Log.v(TAG, "makeLinkProperties with empty dns1!"); } - if (TextUtils.isEmpty(dns2) == false) { + if (!TextUtils.isEmpty(dns2)) { p.addDns(NetworkUtils.numericToInetAddress(dns2)); } else { if (LOCAL_LOGV) Log.v(TAG, "makeLinkProperties with empty dns2!"); @@ -152,11 +152,7 @@ public class DhcpInfoInternal { * metered, and sensitive to heavy data transfers. */ public boolean hasMeteredHint() { - if (vendorInfo != null) { - return vendorInfo.contains("ANDROID_METERED"); - } else { - return false; - } + return vendorInfo != null && vendorInfo.contains("ANDROID_METERED"); } public String toString() { diff --git a/QKSMS/src/main/java/android/net/NetworkTemplate.java b/QKSMS/src/main/java/android/net/NetworkTemplate.java index cee0c43b..8a2cd626 100644 --- a/QKSMS/src/main/java/android/net/NetworkTemplate.java +++ b/QKSMS/src/main/java/android/net/NetworkTemplate.java @@ -331,13 +331,8 @@ public class NetworkTemplate implements Parcelable { * Check if mobile network with matching IMSI. */ private boolean matchesMobile(NetworkIdentity ident) { - if (ident.mType == TYPE_WIMAX) { - // TODO: consider matching against WiMAX subscriber identity - return true; - } else { - return ((sForceAllNetworkTypes || contains(DATA_USAGE_NETWORK_TYPES, ident.mType)) - && Objects.equal(mSubscriberId, ident.mSubscriberId)); - } + // TODO: consider matching against WiMAX subscriber identity + return ident.mType == TYPE_WIMAX || ((sForceAllNetworkTypes || contains(DATA_USAGE_NETWORK_TYPES, ident.mType)) && Objects.equal(mSubscriberId, ident.mSubscriberId)); } /** @@ -391,18 +386,11 @@ public class NetworkTemplate implements Parcelable { * Check if matches Ethernet network template. */ private boolean matchesEthernet(NetworkIdentity ident) { - if (ident.mType == TYPE_ETHERNET) { - return true; - } - return false; + return ident.mType == TYPE_ETHERNET; } private boolean matchesMobileWildcard(NetworkIdentity ident) { - if (ident.mType == TYPE_WIMAX) { - return true; - } else { - return sForceAllNetworkTypes || contains(DATA_USAGE_NETWORK_TYPES, ident.mType); - } + return ident.mType == TYPE_WIMAX || sForceAllNetworkTypes || contains(DATA_USAGE_NETWORK_TYPES, ident.mType); } private boolean matchesWifiWildcard(NetworkIdentity ident) { diff --git a/QKSMS/src/main/java/android/net/ProxyProperties.java b/QKSMS/src/main/java/android/net/ProxyProperties.java index 9d6068f5..6a1e83fe 100644 --- a/QKSMS/src/main/java/android/net/ProxyProperties.java +++ b/QKSMS/src/main/java/android/net/ProxyProperties.java @@ -149,13 +149,12 @@ public class ProxyProperties implements Parcelable { if (!(o instanceof ProxyProperties)) return false; ProxyProperties p = (ProxyProperties) o; if (mExclusionList != null && !mExclusionList.equals(p.getExclusionList())) return false; - if (mHost != null && p.getHost() != null && mHost.equals(p.getHost()) == false) { + if (mHost != null && p.getHost() != null && !mHost.equals(p.getHost())) { return false; } if (mHost != null && p.mHost == null) return false; if (mHost == null && p.mHost != null) return false; - if (mPort != p.mPort) return false; - return true; + return mPort == p.mPort; } /** diff --git a/QKSMS/src/main/java/com/android/mms/MmsConfig.java b/QKSMS/src/main/java/com/android/mms/MmsConfig.java index 8b3994e2..1a438184 100644 --- a/QKSMS/src/main/java/com/android/mms/MmsConfig.java +++ b/QKSMS/src/main/java/com/android/mms/MmsConfig.java @@ -168,7 +168,6 @@ public class MmsConfig { int type; while ((type=parser.next()) != parser.START_TAG && type != parser.END_DOCUMENT) { - ; } if (type != parser.START_TAG) { @@ -186,7 +185,6 @@ public class MmsConfig { int type; while ((type=parser.next()) != parser.START_TAG && type != parser.END_DOCUMENT) { - ; } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/MmsConfig.java b/QKSMS/src/main/java/com/moez/QKSMS/MmsConfig.java index 5f87d601..45f8b8be 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/MmsConfig.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/MmsConfig.java @@ -154,7 +154,7 @@ public class MmsConfig { } public static boolean getMmsEnabled() { - return mMmsEnabled == 1 ? true : false; + return mMmsEnabled == 1; } public static int getMaxMessageSize() { @@ -294,7 +294,6 @@ public class MmsConfig { int type; while ((type=parser.next()) != XmlPullParser.START_TAG && type != XmlPullParser.END_DOCUMENT) { - ; } if (type != XmlPullParser.START_TAG) { @@ -312,7 +311,6 @@ public class MmsConfig { int type; while ((type=parser.next()) != XmlPullParser.START_TAG && type != XmlPullParser.END_DOCUMENT) { - ; } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java index 4637d6ac..50105d42 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java @@ -755,11 +755,8 @@ public class MessageUtils { // "foo+caf_=6505551212=tmomail.net@gmail.com", which is the 'from' address from a forwarded email // message from Gmail. We don't want to treat "foo+caf_=6505551212=tmomail.net@gmail.com" and // "6505551212" to be the same. - if (number.indexOf('@') >= 0) { - return false; - } + return number.indexOf('@') < 0 && PhoneNumberUtils.compare(number, getLocalNumber()); - return PhoneNumberUtils.compare(number, getLocalNumber()); } public static void handleReadReport(final Context context, @@ -919,7 +916,7 @@ public class MessageUtils { public static void viewMmsMessageAttachment(final Activity activity, final Uri msgUri, final SlideshowModel slideshow, final int requestCode, AsyncDialog asyncDialog) { - boolean isSimple = (slideshow == null) ? false : slideshow.isSimple(); + boolean isSimple = (slideshow != null) && slideshow.isSimple(); if (isSimple) { // In attachment-editor mode, we only ever have one slide. MessageUtils.viewSimpleSlideshow(activity, slideshow); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java b/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java index e7a180d4..239b14fe 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java @@ -43,7 +43,7 @@ public class RecipientIdCache { this.id = id; this.number = number; } - }; + } static void init(Context context) { sInstance = new RecipientIdCache(context); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java index a683a0f8..d10b6ab8 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java @@ -1400,10 +1400,7 @@ public class ExifInterface { public boolean isTagCountDefined(int tagId) { int info = getTagInfo().get(tagId); // No value in info can be zero, as all tags have a non-zero type - if (info == 0) { - return false; - } - return getComponentCountFromInfo(info) != ExifTag.SIZE_UNDEFINED; + return info != 0 && getComponentCountFromInfo(info) != ExifTag.SIZE_UNDEFINED; } /** @@ -1550,10 +1547,7 @@ public class ExifInterface { */ public boolean setTagValue(int tagId, int ifdId, Object val) { ExifTag t = getTag(tagId, ifdId); - if (t == null) { - return false; - } - return t.setValue(val); + return t != null && t.setValue(val); } /** @@ -1829,10 +1823,7 @@ public class ExifInterface { */ public boolean setCompressedThumbnail(Bitmap thumb) { ByteArrayOutputStream thumbnail = new ByteArrayOutputStream(); - if (!thumb.compress(Bitmap.CompressFormat.JPEG, 90, thumbnail)) { - return false; - } - return setCompressedThumbnail(thumbnail.toByteArray()); + return thumb.compress(Bitmap.CompressFormat.JPEG, 90, thumbnail) && setCompressedThumbnail(thumbnail.toByteArray()); } /** diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifParser.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifParser.java index 5fa0346f..cc7d606f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifParser.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifParser.java @@ -636,10 +636,7 @@ public class ExifParser { private boolean checkAllowed(int ifd, int tagId) { int info = mInterface.getTagInfo().get(tagId); - if (info == ExifInterface.DEFINITION_NULL) { - return false; - } - return ExifInterface.isIfdAllowed(info, ifd); + return info != ExifInterface.DEFINITION_NULL && ExifInterface.isIfdAllowed(info, ifd); } protected void readFullTagValue(ExifTag tag) throws IOException { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifTag.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifTag.java index 05686f90..ee454116 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifTag.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifTag.java @@ -880,10 +880,7 @@ public class ExifTag { } private boolean checkBadComponentCount(int count) { - if (mHasDefinedDefaultComponentCount && (mComponentCountActual != count)) { - return true; - } - return false; + return mHasDefinedDefaultComponentCount && (mComponentCountActual != count); } private static String convertTypeToString(short type) { @@ -974,20 +971,11 @@ public class ExifTag { if (tag.mValue == null) { return false; } else if (mValue instanceof long[]) { - if (!(tag.mValue instanceof long[])) { - return false; - } - return Arrays.equals((long[]) mValue, (long[]) tag.mValue); + return tag.mValue instanceof long[] && Arrays.equals((long[]) mValue, (long[]) tag.mValue); } else if (mValue instanceof Rational[]) { - if (!(tag.mValue instanceof Rational[])) { - return false; - } - return Arrays.equals((Rational[]) mValue, (Rational[]) tag.mValue); + return tag.mValue instanceof Rational[] && Arrays.equals((Rational[]) mValue, (Rational[]) tag.mValue); } else if (mValue instanceof byte[]) { - if (!(tag.mValue instanceof byte[])) { - return false; - } - return Arrays.equals((byte[]) mValue, (byte[]) tag.mValue); + return tag.mValue instanceof byte[] && Arrays.equals((byte[]) mValue, (byte[]) tag.mValue); } else { return mValue.equals(tag.mValue); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Utils.java b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Utils.java index 57ef5924..e34d6a21 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Utils.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Utils.java @@ -401,9 +401,6 @@ public class Utils { * @return true if app is default */ public static boolean isDefaultSmsApp(Context context) { - if (hasKitKat()) { - return context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context)); - } - return true; + return !hasKitKat() || context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context)); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java index 30aab861..43fb4ed9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java @@ -26,7 +26,6 @@ public class ConversationListAdapter extends RecyclerCursorAdapter