From c051244c2693cf87ccbd694be4efd25c0548e159 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Fri, 12 Sep 2025 08:05:57 -0300
Subject: [PATCH] - When migrating to datastore check if private key is null -
 Remove unused function from LocalPreferences

---
 .../nostrsigner/LocalPreferences.kt           | 49 +++----------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/LocalPreferences.kt b/app/src/main/java/com/greenart7c3/nostrsigner/LocalPreferences.kt
index 38326595..5463aaad 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/LocalPreferences.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/LocalPreferences.kt
@@ -34,7 +34,7 @@ private enum class PrefKeys(val key: String) {
     ACCOUNT_NAME("account_name"),
     LANGUAGE_PREFS("languagePreferences"),
     SIGN_POLICY("default_sign_policy"),
-    SEED_WORDS2("seed_words"),
+    SEED_WORDS("seed_words"),
     PROFILE_URL("profile_url"),
     LAST_METADATA_UPDATE("last_metadata_update"),
     LAST_CHECK("last_check"),
@@ -155,10 +155,6 @@ object LocalPreferences {
         }
     }
 
-    fun getLastCheck(context: Context, npub: String): Long {
-        return sharedPrefs(context, npub).getLong(PrefKeys.LAST_CHECK.key, 0)
-    }
-
     fun setLastCheck(context: Context, npub: String, time: Long) {
         sharedPrefs(context, npub).edit {
             apply {
@@ -167,10 +163,6 @@ object LocalPreferences {
         }
     }
 
-    fun getLastMetadataUpdate(context: Context, npub: String): Long {
-        return sharedPrefs(context, npub).getLong(PrefKeys.LAST_METADATA_UPDATE.key, 0)
-    }
-
     fun setLastMetadataUpdate(context: Context, npub: String, time: Long) {
         sharedPrefs(context, npub).edit {
             apply {
@@ -184,27 +176,6 @@ object LocalPreferences {
         return sharedPrefs(context).getString(SettingsKeys.PIN.key, null)
     }
 
-    fun loadProfileUrlFromEncryptedStorage(npub: String): String? {
-        val context = Amber.instance
-        return sharedPrefs(context, npub).getString(PrefKeys.PROFILE_URL.key, null)
-    }
-
-    fun saveProfileUrlToEncryptedStorage(profileUrl: String?, npub: String) {
-        val context = Amber.instance
-        sharedPrefs(context, npub).edit {
-            apply {
-                if (profileUrl == null) {
-                    remove(PrefKeys.PROFILE_URL.key)
-                } else {
-                    putString(PrefKeys.PROFILE_URL.key, profileUrl)
-                }
-            }
-        }
-        accountCache.get(npub)?.let {
-            it.name.tryEmit(profileUrl ?: "")
-        }
-    }
-
     fun savePinToEncryptedStorage(pin: String?) {
         val context = Amber.instance
         sharedPrefs(context).edit {
@@ -494,9 +465,7 @@ object LocalPreferences {
                 putString(PrefKeys.ACCOUNT_NAME.key, value)
             }
         }
-        accountCache.get(npub)?.let {
-            it.name.tryEmit(value)
-        }
+        accountCache.get(npub)?.name?.tryEmit(value)
     }
 
     fun getAccountName(context: Context, npub: String): String {
@@ -559,26 +528,22 @@ object LocalPreferences {
     suspend fun migrateFromSharedPrefs(context: Context, npub: String) {
         withContext(Dispatchers.IO) {
             if (didMigrateFromLegacyStorage(context, npub)) return@withContext
-
             val legacyPrefs = encryptedPreferences(context, npub)
-
             val privKey = legacyPrefs.getString(PrefKeys.NOSTR_PRIVKEY.key, null)
-            val seedWords = legacyPrefs.getString(PrefKeys.SEED_WORDS2.key, null)
-
-            if (!privKey.isNullOrBlank()) {
-                DataStoreAccess.saveEncryptedKey(context, npub, DataStoreAccess.NOSTR_PRIVKEY, privKey)
+            if (privKey.isNullOrBlank()) {
+                return@withContext
             }
-
+            val seedWords = legacyPrefs.getString(PrefKeys.SEED_WORDS.key, null)
+            DataStoreAccess.saveEncryptedKey(context, npub, DataStoreAccess.NOSTR_PRIVKEY, privKey)
             if (!seedWords.isNullOrBlank()) {
                 DataStoreAccess.saveEncryptedKey(context, npub, DataStoreAccess.SEED_WORDS, seedWords)
             }
             legacyPrefs.edit {
                 apply {
                     remove(PrefKeys.NOSTR_PRIVKEY.key)
-                    remove(PrefKeys.SEED_WORDS2.key)
+                    remove(PrefKeys.SEED_WORDS.key)
                 }
             }
-
             migrateUserSharedPrefs(context, npub)
             deleteLegacyUserPreferenceFile(context, npub)
             if (existsLegacySettings(context)) {