From fea6e5f7047f3fb8f5c3c041f9eeae1927792e1a Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 30 Oct 2023 13:32:58 -0600
Subject: [PATCH] Fix potential issue setting account (only happens sometimes)

---
 .../ui/account/AccountSelectActivity.kt          | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
index 0fbe2117..d002481b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
@@ -58,16 +58,28 @@ class AccountSelectActivity : AppCompatActivity() {
             showPinInputDialog(this@AccountSelectActivity, selectedAccount.lockPin, false) { pin ->
                 if (pin == null) return@showPinInputDialog
                 // Pin is correct, proceed to main activity
-                DataStoreHelper.selectedKeyIndex = selectedAccount.keyIndex
+                setAccount(selectedAccount)
                 navigateToMainActivity()
             }
         } else {
             // No PIN set for the selected account, proceed to main activity
-            DataStoreHelper.selectedKeyIndex = selectedAccount.keyIndex
+            setAccount(selectedAccount)
             navigateToMainActivity()
         }
     }
 
+    private fun setAccount(account: DataStoreHelper.Account) {
+        // Don't reload if it is the same account
+        if (DataStoreHelper.selectedKeyIndex == account.keyIndex) {
+            return
+        }
+
+        DataStoreHelper.selectedKeyIndex = account.keyIndex
+
+        MainActivity.bookmarksUpdatedEvent(true)
+        MainActivity.reloadHomeEvent(true)
+    }
+
     private fun navigateToMainActivity() {
         val mainIntent = Intent(this, MainActivity::class.java)
         startActivity(mainIntent)