upgraded pin-code settings

app/src/main/java/com/guardanis/applock/AppLock.java

@@ -90,11 +90,11 @@ public class AppLock {
     }
 
     public static String getPinCodeTime(Context context) {
-        return context.getSharedPreferences(PREFS, 0).getString("pincode_time", "1440");
+        return context.getString(AndroidUtils.getIdentifier("applock__activity_lock_reenable_minutes", "integer"));
     }
 
     public static String getPinCodeLimits(Context context) {
-        return context.getSharedPreferences(PREFS, 0).getString("pincode_limits", "4");
+        return context.getString(AndroidUtils.getIdentifier("applock__input_pin_item_count", "integer"));
     }
 
     /**

app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java

@@ -33,6 +33,8 @@ import android.widget.Toast;
 
 import androidx.appcompat.view.ContextThemeWrapper;
 
+import com.guardanis.applock.AppLock;
+import com.guardanis.applock.activities.LockCreationActivity;
 import com.vk.auth.api.VKAccount;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.util.ToastUtils;
@@ -87,11 +89,6 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
     }
 
     private void prefs() {
-        findPreference("pin").setOnPreferenceClickListener(preference -> {
-            NavigatorUtils.switchFragment(requireContext(), PinFragment.class);
-            return true;
-        });
-
         findPreference("firebasefix").setOnPreferenceClickListener(preference -> {
             VKAccount b = VKAccountManager.d();
             PushSubscriber.e.a();
@@ -111,6 +108,22 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
+        findPreference("pin_setup").setOnPreferenceClickListener(preference -> {
+            var intent = new Intent(this.getActivity(), LockCreationActivity.class);
+            startActivityForResult(intent, AppLock.REQUEST_CODE_LOCK_CREATION);
+            return true;
+        });
+
+        findPreference("pin_reset").setOnPreferenceClickListener(preference -> {
+            if (AppLock.isEnrolled(requireContext())) {
+                AppLock.getInstance(requireContext()).invalidateEnrollments();
+                AndroidUtils.sendToast("Pin-код успешно сброшен");
+            } else {
+                AndroidUtils.sendToast("Pin-код не установлен");
+            }
+            return true;
+        });
+
         findPreference("tokencopy").setOnPreferenceClickListener(preference -> {
             copyText(getUserToken());
 

app/src/main/java/ru/vtosters/lite/ui/fragments/PinFragment.java

@@ -1,62 +0,0 @@
-package ru.vtosters.lite.ui.fragments;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.os.Bundle;
-import com.guardanis.applock.AppLock;
-import com.guardanis.applock.activities.LockCreationActivity;
-import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
-import ru.vtosters.lite.ui.PreferenceFragmentUtils;
-import ru.vtosters.lite.utils.AndroidUtils;
-
-public class PinFragment extends MaterialPreferenceToolbarFragment {
-    @SuppressLint("CommitPrefEdits")
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        this.addPreferencesFromResource(com.vtosters.lite.R.xml.empty);
-        PreferenceFragmentUtils.addPreference(
-                getPreferenceScreen(),
-                "",
-                "Установить PIN-код",
-                "Установить PIN-код для входа в приложение",
-                null,
-                preference -> {
-                    var intent = new Intent(this.getActivity(), LockCreationActivity.class);
-                    startActivityForResult(intent, AppLock.REQUEST_CODE_LOCK_CREATION);
-                    return true;
-                }
-        );
-
-        PreferenceFragmentUtils.addPreference(
-                getPreferenceScreen(),
-                "",
-                "Сбросить PIN-код",
-                "",
-                null,
-                preference -> {
-                    AppLock.getInstance(requireContext()).invalidateEnrollments();
-                    AndroidUtils.sendToast("Pin-код успешно сброшен");
-                    return true;
-                }
-        );
-
-        PreferenceFragmentUtils.addPreferenceCategory(
-                getPreferenceScreen(),
-                "Тестовые функции, потом выпилим/переделаем"
-        );
-
-
-        PreferenceFragmentUtils.addEditTextValPreference(
-                getPreferenceScreen(),
-                "",
-                "Кол-во символов пин кода",
-                AppLock.getPinCodeLimits(requireContext()),
-                ((preference, o) -> {
-                    AppLock.getInstance(requireContext()).getPreferences().edit().putString("pincode_limits", o).apply();
-                    AndroidUtils.sendToast("Сохранено");
-                    return true;
-                })
-        );
-    }
-}

smali/res/xml/preferences_other.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="Настройки PIN">
+    <PreferenceCategory android:title="PIN-код">
         <Preference
-                android:key="pin"
+                android:key="pin_setup"
                 android:title="Установить PIN"/>
+        <Preference
+                android:key="pin_reset"
+                android:title="Сбросить PIN"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/other_fix_app">
         <Preference