diff --git a/QKSMS/src/main/java/android/net/LinkProperties.java b/QKSMS/src/main/java/android/net/LinkProperties.java index d00be14d..87842c7b 100644 --- a/QKSMS/src/main/java/android/net/LinkProperties.java +++ b/QKSMS/src/main/java/android/net/LinkProperties.java @@ -204,8 +204,7 @@ public class LinkProperties implements Parcelable { */ public boolean isIdenticalDnses(LinkProperties target) { Collection targetDnses = target.getDnses(); - return (mDnses.size() == targetDnses.size()) ? - mDnses.containsAll(targetDnses) : false; + return (mDnses.size() == targetDnses.size()) && mDnses.containsAll(targetDnses); } /** @@ -216,8 +215,7 @@ public class LinkProperties implements Parcelable { */ public boolean isIdenticalRoutes(LinkProperties target) { Collection targetRoutes = target.getRoutes(); - return (mRoutes.size() == targetRoutes.size()) ? - mRoutes.containsAll(targetRoutes) : false; + return (mRoutes.size() == targetRoutes.size()) && mRoutes.containsAll(targetRoutes); } /** diff --git a/QKSMS/src/main/java/com/android/mms/transaction/RetryScheduler.java b/QKSMS/src/main/java/com/android/mms/transaction/RetryScheduler.java index 753b60fe..c0b94501 100644 --- a/QKSMS/src/main/java/com/android/mms/transaction/RetryScheduler.java +++ b/QKSMS/src/main/java/com/android/mms/transaction/RetryScheduler.java @@ -65,7 +65,7 @@ public class RetryScheduler implements Observer { ConnectivityManager mConnMgr = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo ni = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS); - return (ni == null ? false : ni.isConnected()); + return (ni != null && ni.isConnected()); } public void update(Observable observable) { diff --git a/QKSMS/src/main/java/com/google/android/mms/pdu_alt/Base64.java b/QKSMS/src/main/java/com/google/android/mms/pdu_alt/Base64.java index cd10501e..e388954d 100644 --- a/QKSMS/src/main/java/com/google/android/mms/pdu_alt/Base64.java +++ b/QKSMS/src/main/java/com/google/android/mms/pdu_alt/Base64.java @@ -132,11 +132,7 @@ public class Base64 { private static boolean isBase64(byte octect) { if (octect == PAD) { return true; - } else if (base64Alphabet[octect] == -1) { - return false; - } else { - return true; - } + } else return base64Alphabet[octect] != -1; } /** diff --git a/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java b/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java index 2106b174..54b94985 100644 --- a/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java +++ b/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java @@ -810,7 +810,7 @@ public class PduComposer { } // Need at least one of "cc", "bcc" and "to". - if (false == recipient) { + if (!recipient) { return PDU_COMPOSE_CONTENT_ERROR; } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/PhoneNumberUtils.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/PhoneNumberUtils.java index 3cfb58bc..b47dbf81 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/PhoneNumberUtils.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/PhoneNumberUtils.java @@ -313,11 +313,8 @@ public class PhoneNumberUtils extends android.telephony.PhoneNumberUtils { // if the number of dialable chars in a and b match, but the matched chars < MIN_MATCH, // treat them as equal (i.e. 404-04 and 40404) - if (effectiveALen == effectiveBLen && effectiveALen == matched) { - return true; - } + return effectiveALen == effectiveBLen && effectiveALen == matched; - return false; } // At least one string has matched completely; @@ -346,13 +343,9 @@ public class PhoneNumberUtils extends android.telephony.PhoneNumberUtils { return true; } - if (matchTrunkPrefix(b, ib + 1) - && matchIntlPrefixAndCC(a, ia +1) - ) { - return true; - } + return matchTrunkPrefix(b, ib + 1) + && matchIntlPrefixAndCC(a, ia + 1); - return false; } /** all of 'a' up to len must be a (+|00|011)country code) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/ViewUtils.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/ViewUtils.java index f04d6f9f..22a6fb80 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/ViewUtils.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/ViewUtils.java @@ -20,9 +20,6 @@ public class ViewUtils { int vw = view.getWidth(); int vh = view.getHeight(); - if (x < vx || x > vx + vw || y < vy || y > vy + vh) { - return false; - } - return true; + return !(x < vx || x > vx + vw || y < vy || y > vy + vh); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Base64.java b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Base64.java index 730e4997..473b6c58 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Base64.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Base64.java @@ -276,7 +276,7 @@ public class Base64 { // If doPadding is false, set length to truncate '=' // padding characters - while (doPadding == false && outLen > 0) { + while (!doPadding && outLen > 0) { if (outBuff[outLen - 1] != '=') { break; } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java index e512e464..e14117b9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java @@ -322,11 +322,7 @@ public class Transaction { private boolean checkIfMessageExistsAfterDelay(Uri messageUti) { Cursor query = context.getContentResolver().query(messageUti, new String[] {"_id"}, null, null, null); - if (query != null && query.moveToFirst()) { - return true; - } else { - return false; - } + return query != null && query.moveToFirst(); } private void sendMmsMessage(String text, String[] addresses, Bitmap[] image, String[] imageNames, byte[] media, String mimeType, String subject) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java index 5bee0d49..5335aafe 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java @@ -643,10 +643,8 @@ public class SlideshowModel extends Model return false; // No audio allowed. - if (slide.hasAudio()) - return false; + return !slide.hasAudio(); - return true; } /**