pincode code cleanup

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<Class, LockService> lockServices = new HashMap<Class, LockService>();
+    protected HashMap<Class<? extends LockService>, LockService> lockServices = new HashMap<>();
     protected int unlockAttemptsCount = 1;
 
     protected AppLock(Context context) {

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;

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;
 

app/src/main/java/com/guardanis/applock/dialogs/AppLockDialogBuilder.java

@@ -86,10 +86,7 @@ public abstract class AppLockDialogBuilder<ALVC extends AppLockViewController> {
             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

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;
             }

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);
         }
     }
 

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) {