From 0c97f1508817fb1f79715d116f5b5caf4a26dbd9 Mon Sep 17 00:00:00 2001 From: aliveoutside <53598473+aliveoutside@users.noreply.github.com> Date: Sun, 5 Mar 2023 17:46:39 +0300 Subject: [PATCH] pincode code cleanup --- .../java/com/guardanis/applock/AppLock.java | 2 +- .../activities/LockCreationActivity.java | 1 - .../applock/activities/UnlockActivity.java | 2 -- .../applock/dialogs/AppLockDialogBuilder.java | 5 +---- .../guardanis/applock/utils/CryptoUtils.java | 4 ++-- .../applock/views/AppLockViewController.java | 18 +++++++----------- .../views/LockCreationViewController.java | 2 +- 7 files changed, 12 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/guardanis/applock/AppLock.java b/app/src/main/java/com/guardanis/applock/AppLock.java index 8a9797594..9d9cf48fd 100644 --- a/app/src/main/java/com/guardanis/applock/AppLock.java +++ b/app/src/main/java/com/guardanis/applock/AppLock.java @@ -36,7 +36,7 @@ public class AppLock { private static final String PREF_UNLOCK_SUCCESS_TIME = "pin__unlock_success_time"; private static AppLock instance; protected Context context; - protected HashMap lockServices = new HashMap(); + protected HashMap, LockService> lockServices = new HashMap<>(); protected int unlockAttemptsCount = 1; protected AppLock(Context context) { diff --git a/app/src/main/java/com/guardanis/applock/activities/LockCreationActivity.java b/app/src/main/java/com/guardanis/applock/activities/LockCreationActivity.java index ce0f4fd86..6fc2fb59e 100644 --- a/app/src/main/java/com/guardanis/applock/activities/LockCreationActivity.java +++ b/app/src/main/java/com/guardanis/applock/activities/LockCreationActivity.java @@ -7,7 +7,6 @@ import android.os.Build; import android.os.Bundle; import android.view.View; import android.view.WindowInsetsController; -import android.widget.LinearLayout; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; diff --git a/app/src/main/java/com/guardanis/applock/activities/UnlockActivity.java b/app/src/main/java/com/guardanis/applock/activities/UnlockActivity.java index ccc91775a..cef4afddf 100644 --- a/app/src/main/java/com/guardanis/applock/activities/UnlockActivity.java +++ b/app/src/main/java/com/guardanis/applock/activities/UnlockActivity.java @@ -6,9 +6,7 @@ import android.os.Bundle; import android.view.KeyEvent; import android.view.View; import android.view.WindowInsetsController; -import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; diff --git a/app/src/main/java/com/guardanis/applock/dialogs/AppLockDialogBuilder.java b/app/src/main/java/com/guardanis/applock/dialogs/AppLockDialogBuilder.java index 741614749..297007e22 100644 --- a/app/src/main/java/com/guardanis/applock/dialogs/AppLockDialogBuilder.java +++ b/app/src/main/java/com/guardanis/applock/dialogs/AppLockDialogBuilder.java @@ -86,10 +86,7 @@ public abstract class AppLockDialogBuilder { Context context = ((ContextWrapper) dialog.getContext()).getBaseContext(); if (context instanceof Activity) { if (!((Activity) context).isFinishing()) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { - if (!((Activity) context).isDestroyed()) - dialog.dismiss(); - } else + if (!((Activity) context).isDestroyed()) dialog.dismiss(); } } else diff --git a/app/src/main/java/com/guardanis/applock/utils/CryptoUtils.java b/app/src/main/java/com/guardanis/applock/utils/CryptoUtils.java index 3e475ca76..ec59193e8 100644 --- a/app/src/main/java/com/guardanis/applock/utils/CryptoUtils.java +++ b/app/src/main/java/com/guardanis/applock/utils/CryptoUtils.java @@ -26,9 +26,9 @@ public class CryptoUtils { int twoHalves = 0; do { - buf.append((0 <= half) && (half <= 9) + buf.append(half <= 9 ? (char) ('0' + half) - : (char) ('a' + (half - 10))); + : (char) ('a' + half - 10)); half = b & 0x0F; } diff --git a/app/src/main/java/com/guardanis/applock/views/AppLockViewController.java b/app/src/main/java/com/guardanis/applock/views/AppLockViewController.java index 2c972a947..50a18399f 100644 --- a/app/src/main/java/com/guardanis/applock/views/AppLockViewController.java +++ b/app/src/main/java/com/guardanis/applock/views/AppLockViewController.java @@ -37,10 +37,10 @@ public abstract class AppLockViewController implements LifeCycleUtils.AppLockAct public AppLockViewController(Activity activity, View parent) { this.activity = new WeakReference<>(activity); this.parent = new WeakReference<>(parent); - this.descriptionView = new WeakReference((TextView) parent.findViewById(AndroidUtils.getIdentifier("pin__description", "id"))); + this.descriptionView = new WeakReference<>(parent.findViewById(AndroidUtils.getIdentifier("pin__description", "id"))); this.actionSettings = new WeakReference<>(parent.findViewById(AndroidUtils.getIdentifier("pin__action_settings", "id"))); - this.pinInputView = new WeakReference((PINInputView) parent.findViewById(AndroidUtils.getIdentifier("pin__input_view", "id"))); + this.pinInputView = new WeakReference<>(parent.findViewById(AndroidUtils.getIdentifier("pin__input_view", "id"))); int inputViewsCount = Integer.parseInt(AppLock.getPinCodeLimits(activity)); @@ -131,15 +131,11 @@ public abstract class AppLockViewController implements LifeCycleUtils.AppLockAct if (activity == null) return; - switch (errorCode) { - case AppLock.ERROR_CODE_FINGERPRINTS_PERMISSION_REQUIRED: - ActivityCompat.requestPermissions( - activity, - new String[]{Manifest.permission.USE_FINGERPRINT}, - AppLock.REQUEST_CODE_FINGERPRINT_PERMISSION); - break; - default: - break; + if (errorCode == AppLock.ERROR_CODE_FINGERPRINTS_PERMISSION_REQUIRED) { + ActivityCompat.requestPermissions( + activity, + new String[]{Manifest.permission.USE_FINGERPRINT}, + AppLock.REQUEST_CODE_FINGERPRINT_PERMISSION); } } diff --git a/app/src/main/java/com/guardanis/applock/views/LockCreationViewController.java b/app/src/main/java/com/guardanis/applock/views/LockCreationViewController.java index ef4e1e0fb..f69131ef2 100644 --- a/app/src/main/java/com/guardanis/applock/views/LockCreationViewController.java +++ b/app/src/main/java/com/guardanis/applock/views/LockCreationViewController.java @@ -30,7 +30,7 @@ public class LockCreationViewController extends AppLockViewController public LockCreationViewController(Activity activity, View parent) { super(activity, parent); - this.chooserParent = new WeakReference(parent.findViewById(AndroidUtils.getIdentifier("pin__create_chooser_items", "id"))); + this.chooserParent = new WeakReference<>(parent.findViewById(AndroidUtils.getIdentifier("pin__create_chooser_items", "id"))); } public LockCreationViewController setDelegate(Delegate delegate) {