From 7dc07bd407adc42404bc26989e55b4115d625a81 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 28 Oct 2023 17:30:00 -0600
Subject: [PATCH] Fix bugs

---
 .../cloudstream3/utils/DataStoreHelper.kt     | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
index 3362f477..10a990ae 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -242,28 +242,22 @@ object DataStoreHelper {
         }
 
         binding.applyBtt.setOnClickListener {
-            val currentAccounts = accounts.toMutableList()
-
-            val overrideIndex =
-                currentAccounts.indexOfFirst { it.keyIndex == currentEditAccount.keyIndex }
-
-            // If an account is found that has the same keyIndex, override that one; if not, append it
-            if (overrideIndex != -1) {
-                currentAccounts[overrideIndex] = currentEditAccount
+            if (currentEditAccount.lockPin != null) {
+                // Ask for the current PIN
+                showPinInputDialog(context, currentEditAccount.lockPin, false) { pin ->
+                    if (pin == null || pin != currentEditAccount.lockPin) {
+                        binding.lockProfileCheckbox.isChecked = true
+                    } else {
+                        // PIN is correct, proceed to update the account
+                        performAccountUpdate(currentEditAccount)
+                        dialog.dismissSafe()
+                    }
+                }
             } else {
-                currentAccounts.add(currentEditAccount)
+                // No lock PIN set, proceed to update the account
+                performAccountUpdate(currentEditAccount)
+                dialog.dismissSafe()
             }
-
-            // Save the current homepage for new accounts
-            val currentHomePage = DataStoreHelper.currentHomePage
-
-            // Set the new default account as well as add the key for the new account
-            setAccount(currentEditAccount, false)
-            DataStoreHelper.currentHomePage = currentHomePage
-
-            accounts = currentAccounts.toTypedArray()
-
-            dialog.dismissSafe()
         }
 
         // Handle setting or changing the PIN
@@ -297,6 +291,23 @@ object DataStoreHelper {
         canSetPin = true
     }
 
+    private fun performAccountUpdate(account: Account) {
+        val currentAccounts = accounts.toMutableList()
+
+        val overrideIndex = currentAccounts.indexOfFirst { it.keyIndex == account.keyIndex }
+
+        if (overrideIndex != -1) {
+            currentAccounts[overrideIndex] = account
+        } else {
+            currentAccounts.add(account)
+        }
+
+        val currentHomePage = DataStoreHelper.currentHomePage
+        setAccount(account, false)
+        DataStoreHelper.currentHomePage = currentHomePage
+        accounts = currentAccounts.toTypedArray()
+    }
+
     private fun getDefaultAccount(context: Context): Account {
         return accounts.let { currentAccounts ->
             currentAccounts.getOrNull(currentAccounts.indexOfFirst { it.keyIndex == 0 }) ?: Account(
@@ -436,10 +447,15 @@ object DataStoreHelper {
         }
 
         dialog.setButton(AlertDialog.BUTTON_NEGATIVE, context.getString(R.string.cancel)) { _, _ ->
-            callback.invoke(null)
             dialog.dismiss()
         }
 
+        dialog.setOnDismissListener {
+            if (!isPinValid) {
+                callback.invoke(null)
+            }
+        }
+
         dialog.show()
     }