From f051420ff9f2f9dbc2d9d5df0981d4e1607f05b6 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Tue, 7 Mar 2023 19:56:53 +0300 Subject: [PATCH] upgraded pin-code settings --- .../java/com/guardanis/applock/AppLock.java | 4 +- .../lite/ui/fragments/OtherFragment.java | 23 +++++-- .../lite/ui/fragments/PinFragment.java | 62 ------------------- smali/res/xml/preferences_other.xml | 7 ++- 4 files changed, 25 insertions(+), 71 deletions(-) delete mode 100644 app/src/main/java/ru/vtosters/lite/ui/fragments/PinFragment.java diff --git a/app/src/main/java/com/guardanis/applock/AppLock.java b/app/src/main/java/com/guardanis/applock/AppLock.java index 8a9797594..0d0b99293 100644 --- a/app/src/main/java/com/guardanis/applock/AppLock.java +++ b/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")); } /** diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java index f6b47bdae..d067daaac 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java +++ b/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()); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/PinFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/PinFragment.java deleted file mode 100644 index 6aa79a94d..000000000 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/PinFragment.java +++ /dev/null @@ -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; - }) - ); - } -} diff --git a/smali/res/xml/preferences_other.xml b/smali/res/xml/preferences_other.xml index 205800867..0781003ef 100644 --- a/smali/res/xml/preferences_other.xml +++ b/smali/res/xml/preferences_other.xml @@ -1,9 +1,12 @@ - + +