From 5f4886ce52c593bb522a53dfa378cf39a36f3c43 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 4 May 2023 21:10:09 -0400
Subject: [PATCH] Fixes migration of follow lists from old accounts

---
 .../com/vitorpamplona/amethyst/LocalPreferences.kt   |  6 ++++--
 .../java/com/vitorpamplona/amethyst/model/Account.kt | 12 ++++++------
 .../amethyst/ui/actions/NewMediaModel.kt             |  2 +-
 .../amethyst/ui/navigation/AppTopBar.kt              |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt b/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
index cb945c8f7..3882218b1 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
@@ -6,6 +6,8 @@ import android.content.SharedPreferences
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
+import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
@@ -221,8 +223,8 @@ object LocalPreferences {
 
             val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
             val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
-            val defaultHomeFollowList = getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null)
-            val defaultStoriesFollowList = getString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, null)
+            val defaultHomeFollowList = getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: KIND3_FOLLOWS
+            val defaultStoriesFollowList = getString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
 
             val zapAmountChoices = gson.fromJson(
                 getString(PrefKeys.ZAP_AMOUNTS, "[]"),
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
index 5dad0402f..ddacd9993 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -53,8 +53,8 @@ class Account(
     var zapAmountChoices: List<Long> = listOf(500L, 1000L, 5000L),
     var defaultZapType: LnZapEvent.ZapType = LnZapEvent.ZapType.PRIVATE,
     var defaultFileServer: ServersAvailable = ServersAvailable.IMGUR,
-    var defaultHomeFollowList: String? = null,
-    var defaultStoriesFollowList: String? = null,
+    var defaultHomeFollowList: String = KIND3_FOLLOWS,
+    var defaultStoriesFollowList: String = GLOBAL_FOLLOWS,
     var zapPaymentRequest: Nip47URI? = null,
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
@@ -408,12 +408,12 @@ class Account(
         }
     }
 
-    fun createNip95(data: ByteArray, headerInfo: FileHeader): Pair<FileStorageEvent, FileStorageHeaderEvent>? {
+    fun createNip95(byteArray: ByteArray, headerInfo: FileHeader): Pair<FileStorageEvent, FileStorageHeaderEvent>? {
         if (!isWriteable()) return null
 
         val data = FileStorageEvent.create(
             mimeType = headerInfo.mimeType ?: "",
-            data = data,
+            data = byteArray,
             privateKey = loggedIn.privKey!!
         )
 
@@ -734,13 +734,13 @@ class Account(
         saveable.invalidateData()
     }
 
-    fun changeDefaultHomeFollowList(name: String?) {
+    fun changeDefaultHomeFollowList(name: String) {
         defaultHomeFollowList = name
         live.invalidateData()
         saveable.invalidateData()
     }
 
-    fun changeDefaultStoriesFollowList(name: String?) {
+    fun changeDefaultStoriesFollowList(name: String) {
         defaultStoriesFollowList = name
         live.invalidateData()
         saveable.invalidateData()
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt
index 9827c6bb2..ac812b2c2 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt
@@ -138,7 +138,7 @@ open class NewMediaModel : ViewModel() {
                     onReady = {
                         uploadingPercentage.value = 0.90f
                         uploadingDescription.value = "Sending"
-                        val note = account?.sendHeader(it)
+                        account?.sendHeader(it)
                         uploadingPercentage.value = 1.00f
                         isUploadingImage = false
                         onceUploaded()
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
index 91be7bf4f..4415e4648 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
@@ -226,7 +226,7 @@ private fun LoggedInUserPictureDrawer(
 }
 
 @Composable
-fun FollowList(listName: String?, withGlobal: Boolean, onChange: (String?) -> Unit) {
+fun FollowList(listName: String, withGlobal: Boolean, onChange: (String) -> Unit) {
     // Notification
     val dbState = LocalCache.live.observeAsState()
     val db = dbState.value ?: return
@@ -257,7 +257,7 @@ fun FollowList(listName: String?, withGlobal: Boolean, onChange: (String?) -> Un
         placeholder = followLists.firstOrNull { it.first == listName }?.first ?: KIND3_FOLLOWS,
         options = followNames.value,
         onSelect = {
-            onChange(followLists.getOrNull(it)?.first)
+            onChange(followLists.getOrNull(it)?.first ?: KIND3_FOLLOWS)
         }
     )
 }