Use background coroutines for modification operations. Use FollowSet in callbacks, rather than just the set identifier.

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/CustomListsScreen.kt

@@ -154,9 +154,9 @@ fun ListsScreen(
                 account = accountViewModel.account,
             )
         },
-        deleteItem = { identifier ->
+        deleteItem = { followSet ->
             followSetsViewModel.deleteFollowSet(
-                listIdentifier = identifier,
+                followSet = followSet,
                 account = accountViewModel.account,
             )
         },
@@ -178,7 +178,7 @@ fun ListsScreen(
             onProfileRemove = {
                 followSetsViewModel.removeUserFromSet(
                     it,
-                    leFollowSet.identifierTag,
+                    leFollowSet,
                     accountViewModel.account,
                 )
             },
@@ -191,7 +191,7 @@ fun ListsScreen(
             onListDelete = {
                 isFollowSetSelected.value = false
                 followSetsViewModel.deleteFollowSet(
-                    leFollowSet.identifierTag,
+                    leFollowSet,
                     accountViewModel.account,
                 )
             },
@@ -205,8 +205,8 @@ fun CustomListsScreen(
     refresh: () -> Unit,
     addItem: (title: String, description: String?, listType: ListVisibility) -> Unit,
     openItem: (identifier: String) -> Unit,
-    renameItem: (targetSet: FollowSet, newName: String) -> Unit,
+    renameItem: (followSet: FollowSet, newName: String) -> Unit,
-    deleteItem: (setIdentifier: String) -> Unit,
+    deleteItem: (followSet: FollowSet) -> Unit,
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/FollowSetFeedView.kt

@@ -48,7 +48,7 @@ fun FollowSetFeedView(
     onRefresh: () -> Unit = {},
     onOpenItem: (String) -> Unit = {},
     onRenameItem: (targetSet: FollowSet, newName: String) -> Unit,
-    onDeleteItem: (setIdentifier: String) -> Unit,
+    onDeleteItem: (followSet: FollowSet) -> Unit,
 ) {
     when (followSetState) {
         FollowSetState.Loading -> LoadingFeed()
@@ -90,7 +90,7 @@ fun FollowListLoaded(
     onRefresh: () -> Unit = {},
     onItemClick: (itemIdentifier: String) -> Unit = {},
     onItemRename: (followSet: FollowSet, newName: String) -> Unit,
-    onItemDelete: (itemIdentifier: String) -> Unit,
+    onItemDelete: (followSet: FollowSet) -> Unit,
 ) {
     Log.d("FollowSetComposable", "FollowListLoaded: Follow Set size: ${loadedFeedState.size}")
 
@@ -113,7 +113,7 @@ fun FollowListLoaded(
                         onItemRename(set, it)
                     },
                     onFollowSetDelete = {
-                        onItemDelete(set.identifierTag)
+                        onItemDelete(set)
                     },
                 )
                 Spacer(modifier = StdVertSpacer)

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/NostrListFeedViewModel.kt

@@ -124,7 +124,7 @@ class NostrListFeedViewModel(
         if (account.settings.isWriteable()) {
             println("You are in read-only mode. Please login to make modifications.")
         } else {
-            viewModelScope.launch {
+            viewModelScope.launch(Dispatchers.IO) {
                 PeopleListEvent.createListWithDescription(
                     dTag = UUID.randomUUID().toString(),
                     key = "title",
@@ -148,7 +148,7 @@ class NostrListFeedViewModel(
         if (!account.settings.isWriteable()) {
             println("You are in read-only mode. Please login to make modifications.")
         } else {
-            viewModelScope.launch {
+            viewModelScope.launch(Dispatchers.IO) {
                 val setEvent = getFollowSetNote(followSet.identifierTag, account)?.event as PeopleListEvent
                 PeopleListEvent.modifyTag(
                     earlierVersion = setEvent,
@@ -165,15 +165,15 @@ class NostrListFeedViewModel(
     }
 
     fun deleteFollowSet(
-        listIdentifier: String,
+        followSet: FollowSet,
         account: Account,
     ) {
         if (!account.settings.isWriteable()) {
             println("You are in read-only mode. Please login to make modifications.")
             return
         } else {
-            viewModelScope.launch {
+            viewModelScope.launch(Dispatchers.IO) {
-                val followSetEvent = getFollowSetNote(listIdentifier, account)?.event as PeopleListEvent
+                val followSetEvent = getFollowSetNote(followSet.identifierTag, account)?.event as PeopleListEvent
                 account.signer.sign(
                     DeletionEvent.build(listOf(followSetEvent)),
                 ) {
@@ -193,7 +193,7 @@ class NostrListFeedViewModel(
             println("You are in read-only mode. Please login to make modifications.")
             return
         } else {
-            viewModelScope.launch {
+            viewModelScope.launch(Dispatchers.IO) {
                 val followSetEvent = getFollowSetNote(followSet.identifierTag, account)?.event as PeopleListEvent
                 PeopleListEvent.addUser(
                     earlierVersion = followSetEvent,
@@ -210,18 +210,19 @@ class NostrListFeedViewModel(
 
     fun removeUserFromSet(
         userProfileHex: String,
-        listIdentifier: String,
+        followSet: FollowSet,
         account: Account,
     ) {
         if (!account.settings.isWriteable()) {
             println("You are in read-only mode. Please login to make modifications.")
             return
         } else {
-            viewModelScope.launch {
+            viewModelScope.launch(Dispatchers.IO) {
-                val followSetEvent = getFollowSetNote(listIdentifier, account)?.event as PeopleListEvent
+                val followSetEvent = getFollowSetNote(followSet.identifierTag, account)?.event as PeopleListEvent
                 PeopleListEvent.removeUser(
                     earlierVersion = followSetEvent,
                     pubKeyHex = userProfileHex,
+                    isPrivate = followSet.visibility == ListVisibility.Private,
                     signer = account.signer,
                 ) {
                     Amethyst.instance.client.send(it)
@@ -242,13 +243,13 @@ class NostrListFeedViewModel(
     private val bundler = BundledUpdate(2000, Dispatchers.IO)
 
     override fun invalidateData(ignoreIfDoing: Boolean) {
-        refresh()
+//        refresh()
-//        bundler.invalidate(ignoreIfDoing) {
+        bundler.invalidate(ignoreIfDoing) {
-//            // adds the time to perform the refresh into this delay
+            // adds the time to perform the refresh into this delay
-//            // holding off new updates in case of heavy refresh routines.
+            // holding off new updates in case of heavy refresh routines.
-//            sampleRefresh()
+
-//            // refreshSuspended()
+            refreshSuspended()
-//        }
+        }
     }
 
     var collectorJob: Job? = null