From ec1bdaa29904c2886d8bb03b8418ea710a954053 Mon Sep 17 00:00:00 2001 From: Mohammed Ezzat Date: Tue, 22 Mar 2016 23:07:15 +0200 Subject: [PATCH] squid:S1125 - Literal boolean values should not be used in condition expressions --- .../main/java/org/openintents/safe/AskPassword.java | 8 ++++---- .../main/java/org/openintents/safe/CategoryEdit.java | 2 +- .../main/java/org/openintents/safe/CategoryList.java | 8 ++++---- .../src/main/java/org/openintents/safe/ChangePass.java | 10 +++++----- .../org/openintents/safe/CryptoContentProvider.java | 2 +- Safe/src/main/java/org/openintents/safe/Help.java | 4 ++-- .../org/openintents/safe/IntentHandlerActivity.java | 2 +- Safe/src/main/java/org/openintents/safe/PassEdit.java | 2 +- .../java/org/openintents/safe/PassEditFragment.java | 6 +++--- Safe/src/main/java/org/openintents/safe/PassGen.java | 4 ++-- Safe/src/main/java/org/openintents/safe/PassList.java | 4 ++-- Safe/src/main/java/org/openintents/safe/PassView.java | 8 ++++---- .../java/org/openintents/safe/PreferenceActivity.java | 4 ++-- Safe/src/main/java/org/openintents/safe/Restore.java | 10 +++++----- Safe/src/main/java/org/openintents/safe/Search.java | 2 +- .../main/java/org/openintents/safe/SearchFragment.java | 2 +- .../java/org/openintents/safe/model/Passwords.java | 4 ++-- .../openintents/safe/service/ServiceNotification.java | 4 ++-- 18 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Safe/src/main/java/org/openintents/safe/AskPassword.java b/Safe/src/main/java/org/openintents/safe/AskPassword.java index 5a8a3ae1..32dfadf7 100644 --- a/Safe/src/main/java/org/openintents/safe/AskPassword.java +++ b/Safe/src/main/java/org/openintents/safe/AskPassword.java @@ -125,7 +125,7 @@ public void onCreate(Bundle icicle) { } dbHelper = new DBHelper(this); - if (dbHelper.isDatabaseOpen() == false) { + if (!dbHelper.isDatabaseOpen()) { Dialog dbError = new AlertDialog.Builder(this) .setIcon(android.R.drawable.ic_dialog_alert) .setTitle(R.string.database_error_title) @@ -403,7 +403,7 @@ protected void onResume() { if (debug) { Log.d(TAG, "onResume()"); } - if (CategoryList.isSignedIn() == true) { + if (CategoryList.isSignedIn()) { if (debug) { Log.d(TAG, "already signed in"); } @@ -416,7 +416,7 @@ protected void onResume() { if (dbHelper == null) { dbHelper = new DBHelper(this); } - if (dbHelper.isDatabaseOpen() == false) { + if (!dbHelper.isDatabaseOpen()) { if (debug) { Log.d(TAG, "eek! database is not open"); } @@ -592,7 +592,7 @@ private boolean checkUserPassword(String password) { } catch (CryptoHelperException e) { Log.e(TAG, e.toString()); } - if (ch.getStatus() == true) { + if (ch.getStatus()) { dbMasterKey = decryptedMasterKey; return true; } diff --git a/Safe/src/main/java/org/openintents/safe/CategoryEdit.java b/Safe/src/main/java/org/openintents/safe/CategoryEdit.java index df3e5ea7..0a0e9cbe 100644 --- a/Safe/src/main/java/org/openintents/safe/CategoryEdit.java +++ b/Safe/src/main/java/org/openintents/safe/CategoryEdit.java @@ -212,7 +212,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/CategoryList.java b/Safe/src/main/java/org/openintents/safe/CategoryList.java index 6e3d181c..4fd5724c 100644 --- a/Safe/src/main/java/org/openintents/safe/CategoryList.java +++ b/Safe/src/main/java/org/openintents/safe/CategoryList.java @@ -194,7 +194,7 @@ protected void onResume() { Log.d(TAG, "onResume()"); } - if (isSignedIn() == false) { + if (!isSignedIn()) { Intent frontdoor = new Intent(this, Safe.class); frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK); startActivity(frontdoor); @@ -204,7 +204,7 @@ protected void onResume() { registerReceiver(mIntentReceiver, filter); showFirstTimeWarningDialog(); - if (Passwords.getPrePopulate() == true) { + if (Passwords.getPrePopulate()) { prePopulate(); Passwords.clearPrePopulate(); } @@ -238,7 +238,7 @@ private void checkForAutoBackup() { SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); boolean prefAutobackup = sp.getBoolean(PreferenceActivity.PREFERENCE_AUTOBACKUP, true); - if (prefAutobackup == false) { + if (!prefAutobackup) { return; } if (Passwords.countPasswords(-1) < 1) { @@ -1086,7 +1086,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // Intent frontdoor = new Intent(this, FrontDoor.class); // frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK); // startActivity(frontdoor); diff --git a/Safe/src/main/java/org/openintents/safe/ChangePass.java b/Safe/src/main/java/org/openintents/safe/ChangePass.java index 3906507f..6d30ee80 100644 --- a/Safe/src/main/java/org/openintents/safe/ChangePass.java +++ b/Safe/src/main/java/org/openintents/safe/ChangePass.java @@ -119,7 +119,7 @@ protected void onResume() { Log.d(TAG, "onResume()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { startActivity(frontdoor); return; } @@ -182,10 +182,10 @@ private boolean changeMasterPassword(String oldPass, String newPass) { ch.init(CryptoHelper.EncryptionStrong, dbHelper.fetchSalt()); ch.setPassword(oldPass); decryptedMasterKey = ch.decrypt(encryptedMasterKey); - if (ch.getStatus() == true) { // successful decryption? + if (ch.getStatus()) { // successful decryption? ch.setPassword(newPass); encryptedMasterKey = ch.encrypt(decryptedMasterKey); - if (ch.getStatus() == true) { // successful encryption? + if (ch.getStatus()) { // successful encryption? dbHelper.storeMasterKey(encryptedMasterKey); Passwords.InitCrypto(CryptoHelper.EncryptionMedium, dbHelper.fetchSalt(), decryptedMasterKey); Passwords.Reset(); @@ -398,7 +398,7 @@ private boolean checkUserPassword(String pass) { dbHelper.close(); // was decryption of the master key successful? - if (ch.getStatus() == true) { + if (ch.getStatus()) { return true; // then we must have a good master password } return false; @@ -412,7 +412,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/CryptoContentProvider.java b/Safe/src/main/java/org/openintents/safe/CryptoContentProvider.java index 0fd18fed..79bd5406 100644 --- a/Safe/src/main/java/org/openintents/safe/CryptoContentProvider.java +++ b/Safe/src/main/java/org/openintents/safe/CryptoContentProvider.java @@ -162,7 +162,7 @@ public ParcelFileDescriptor openFile(Uri uri, String mode) if (debug) { Log.d(TAG, "Original file path: " + originalFile); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { Intent frontdoor = new Intent(getContext(), Safe.class); frontdoor.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); getContext().startActivity(frontdoor); diff --git a/Safe/src/main/java/org/openintents/safe/Help.java b/Safe/src/main/java/org/openintents/safe/Help.java index 0a5c0078..6eef17d2 100644 --- a/Safe/src/main/java/org/openintents/safe/Help.java +++ b/Safe/src/main/java/org/openintents/safe/Help.java @@ -123,7 +123,7 @@ protected void onResume() { Log.d(TAG, "onResume()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { startActivity(frontdoor); return; } @@ -159,7 +159,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/IntentHandlerActivity.java b/Safe/src/main/java/org/openintents/safe/IntentHandlerActivity.java index 7453be9b..f1ff422b 100644 --- a/Safe/src/main/java/org/openintents/safe/IntentHandlerActivity.java +++ b/Safe/src/main/java/org/openintents/safe/IntentHandlerActivity.java @@ -67,7 +67,7 @@ public void onCreate(Bundle icicle) { mPreferences = PreferenceManager.getDefaultSharedPreferences(this); - if (Passwords.Initialize(this) == false) { + if (!Passwords.Initialize(this)) { finish(); } } diff --git a/Safe/src/main/java/org/openintents/safe/PassEdit.java b/Safe/src/main/java/org/openintents/safe/PassEdit.java index 74d3b40c..0f77c355 100644 --- a/Safe/src/main/java/org/openintents/safe/PassEdit.java +++ b/Safe/src/main/java/org/openintents/safe/PassEdit.java @@ -79,7 +79,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/PassEditFragment.java b/Safe/src/main/java/org/openintents/safe/PassEditFragment.java index 499d376f..fec80f80 100644 --- a/Safe/src/main/java/org/openintents/safe/PassEditFragment.java +++ b/Safe/src/main/java/org/openintents/safe/PassEditFragment.java @@ -270,7 +270,7 @@ public void onPause() { Log.d(TAG, "onPause()"); } - if (getActivity().isFinishing() && discardEntry == false && allFieldsEmpty() == false) { + if (getActivity().isFinishing() && !discardEntry && !allFieldsEmpty()) { savePassword(); } try { @@ -296,7 +296,7 @@ public void onResume() { Log.d(TAG, "onResume()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // if (Passwords.isCryptoInitialized()) { // saveState(); // } @@ -436,7 +436,7 @@ private void populateFields() { if (debug) { Log.d(TAG, "populateFields()"); } - if (pass_gen_ret == true) { + if (pass_gen_ret) { pass_gen_ret = false; return; } diff --git a/Safe/src/main/java/org/openintents/safe/PassGen.java b/Safe/src/main/java/org/openintents/safe/PassGen.java index 9b216e32..de9622f3 100644 --- a/Safe/src/main/java/org/openintents/safe/PassGen.java +++ b/Safe/src/main/java/org/openintents/safe/PassGen.java @@ -238,7 +238,7 @@ protected void onPause() { protected void onResume() { super.onResume(); - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { startActivity(frontdoor); return; } @@ -272,7 +272,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/PassList.java b/Safe/src/main/java/org/openintents/safe/PassList.java index ce215e37..e1c7fd89 100644 --- a/Safe/src/main/java/org/openintents/safe/PassList.java +++ b/Safe/src/main/java/org/openintents/safe/PassList.java @@ -200,7 +200,7 @@ protected void onResume() { Log.d(TAG, "onResume()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { startActivity(frontdoor); return; } @@ -597,7 +597,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/PassView.java b/Safe/src/main/java/org/openintents/safe/PassView.java index d860d8f4..11e6f842 100644 --- a/Safe/src/main/java/org/openintents/safe/PassView.java +++ b/Safe/src/main/java/org/openintents/safe/PassView.java @@ -240,7 +240,7 @@ private View createView(int position, View view) { LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = inflater.inflate(R.layout.pass_view, null); } - if (populateFields(rowids[position], view) == false) { + if (!populateFields(rowids[position], view)) { // failed to retreive record return null; } @@ -283,7 +283,7 @@ public void onClick(View arg0) { return; } - if (usernameCopiedToClipboard == false) { + if (!usernameCopiedToClipboard) { // don't copy the password if username was already copied clipboard(getString(R.string.password), passwordText.getText().toString()); } @@ -416,7 +416,7 @@ protected void onResume() { Log.d(TAG, "onResume()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { startActivity(frontdoor); return; } @@ -687,7 +687,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/PreferenceActivity.java b/Safe/src/main/java/org/openintents/safe/PreferenceActivity.java index 1db079a7..9ffde954 100644 --- a/Safe/src/main/java/org/openintents/safe/PreferenceActivity.java +++ b/Safe/src/main/java/org/openintents/safe/PreferenceActivity.java @@ -150,7 +150,7 @@ public boolean onPreferenceClick(Preference pref) { protected void onResume() { super.onResume(); - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { startActivity(frontdoor); return; } @@ -177,7 +177,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/Restore.java b/Safe/src/main/java/org/openintents/safe/Restore.java index 590487cd..06d294bc 100644 --- a/Safe/src/main/java/org/openintents/safe/Restore.java +++ b/Safe/src/main/java/org/openintents/safe/Restore.java @@ -107,7 +107,7 @@ public void onCreate(Bundle icicle) { } firstTime = icicle != null ? icicle.getBoolean(Restore.KEY_FIRST_TIME) : false; - if (firstTime == false) { + if (!firstTime) { Bundle extras = getIntent().getExtras(); firstTime = extras != null ? extras.getBoolean(Restore.KEY_FIRST_TIME) : false; } @@ -177,7 +177,7 @@ protected void onResume() { Log.d(TAG, "onResume()"); } - if ((!firstTime) && (CategoryList.isSignedIn() == false)) { + if ((!firstTime) && (!CategoryList.isSignedIn())) { startActivity(frontdoor); return; } @@ -273,7 +273,7 @@ this, getString(R.string.crypto_error) ).show(); return false; } - if (ch.getStatus() == false) { + if (!ch.getStatus()) { Toast.makeText( Restore.this, getString(R.string.restore_decrypt_error), Toast.LENGTH_LONG @@ -304,7 +304,7 @@ this, getString(R.string.crypto_error) } catch (CryptoHelperException e) { Log.e(TAG, e.toString()); } - if (ch.getStatus() == false) { + if (!ch.getStatus()) { Toast.makeText( Restore.this, getString(R.string.restore_decrypt_error), Toast.LENGTH_LONG @@ -407,7 +407,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/Search.java b/Safe/src/main/java/org/openintents/safe/Search.java index ef54053e..662da41c 100644 --- a/Safe/src/main/java/org/openintents/safe/Search.java +++ b/Safe/src/main/java/org/openintents/safe/Search.java @@ -50,7 +50,7 @@ public void onUserInteraction() { Log.d(TAG, "onUserInteraction()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { // startActivity(frontdoor); } else { if (restartTimerIntent != null) { diff --git a/Safe/src/main/java/org/openintents/safe/SearchFragment.java b/Safe/src/main/java/org/openintents/safe/SearchFragment.java index ad0f9dc4..33e6b8d9 100644 --- a/Safe/src/main/java/org/openintents/safe/SearchFragment.java +++ b/Safe/src/main/java/org/openintents/safe/SearchFragment.java @@ -199,7 +199,7 @@ public void onResume() { Log.d(TAG, "onResume()"); } - if (CategoryList.isSignedIn() == false) { + if (!CategoryList.isSignedIn()) { startActivity(frontdoor); return; } diff --git a/Safe/src/main/java/org/openintents/safe/model/Passwords.java b/Safe/src/main/java/org/openintents/safe/model/Passwords.java index ae0996dc..6e03d483 100644 --- a/Safe/src/main/java/org/openintents/safe/model/Passwords.java +++ b/Safe/src/main/java/org/openintents/safe/model/Passwords.java @@ -332,7 +332,7 @@ public static List getPassEntries(long categoryId, boolean decrypt, b passList.add(passEntry); } } - if (decrypt == true) { + if (decrypt) { Collections.sort( passList, new Comparator() { public int compare(PassEntry o1, PassEntry o2) { @@ -355,7 +355,7 @@ public static PassEntry getPassEntry(Long id, boolean decrypt, boolean descripti if (passEntry == null) { return null; } - if (decrypt == false) { + if (!decrypt) { return passEntry; } if (passEntry.needsDecryptDescription) { diff --git a/Safe/src/main/java/org/openintents/safe/service/ServiceNotification.java b/Safe/src/main/java/org/openintents/safe/service/ServiceNotification.java index f54f1db2..2012a2da 100644 --- a/Safe/src/main/java/org/openintents/safe/service/ServiceNotification.java +++ b/Safe/src/main/java/org/openintents/safe/service/ServiceNotification.java @@ -72,7 +72,7 @@ public static void setNotification(Context context) { Log.d(TAG, "builder=" + CheckWrappers.mNotificationBuilderAvailable); } if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) - || (CheckWrappers.mNotificationBuilderAvailable == false)) { + || (!CheckWrappers.mNotificationBuilderAvailable)) { notificationCompat = new NotificationCompat.Builder(context) .setContentTitle(context.getString(R.string.app_name)) .setContentText( @@ -125,7 +125,7 @@ public static void clearNotification(Context context) { @SuppressLint("NewApi") public static void updateProgress(Context context, int max, int progress) { if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) && - (CheckWrappers.mNotificationBuilderAvailable == true)) { + (CheckWrappers.mNotificationBuilderAvailable)) { wrapBuilder.setProgress(max, progress, false); wrapBuilder.notifyManager(mNotifyManager, NOTIFICATION_ID); }