Moving away from handlers and into coroutines.

app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt

@@ -13,6 +13,7 @@ import java.util.Collections
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import nostr.postr.events.Event
 
@@ -99,17 +100,18 @@ class Note(val idHex: String) {
     val live: NoteLiveData = NoteLiveData(this)
 
     // Refreshes observers in batches.
-    val filterHandler = Handler(Looper.getMainLooper())
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
     var handlerWaiting = false
     @Synchronized
     fun invalidateData() {
         if (handlerWaiting) return
 
         handlerWaiting = true
-        filterHandler.postDelayed({
+        scope.launch {
+            delay(100)
             live.refresh()
             handlerWaiting = false
-        }, 100)
+        }
     }
 }
 
@@ -120,19 +122,13 @@ class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
 
     override fun onActive() {
         super.onActive()
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
         NostrSingleEventDataSource.add(note.idHex)
     }
-    }
 
     override fun onInactive() {
         super.onInactive()
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
         NostrSingleEventDataSource.remove(note.idHex)
     }
-    }
 }
 
 class NoteState(val note: Note)

app/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt

@@ -22,7 +22,7 @@ object UrlCachedPreviewer {
       return
     }
 
-    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
     scope.launch {
       BahaUrlPreview(url, object : IUrlPreviewCallback {
         override fun onComplete(urlInfo: UrlInfoItem) {

app/src/main/java/com/vitorpamplona/amethyst/model/User.kt

@@ -11,6 +11,7 @@ import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import nostr.postr.events.ContactListEvent
 
@@ -112,18 +113,18 @@ class User(val pubkey: ByteArray) {
     val live: UserLiveData = UserLiveData(this)
 
     // Refreshes observers in batches.
-    val filterHandler = Handler(Looper.getMainLooper())
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
     var handlerWaiting = false
     @Synchronized
     fun invalidateData() {
         if (handlerWaiting) return
 
         handlerWaiting = true
-        filterHandler.postDelayed({
+        scope.launch {
-            println("User Refresh")
+            delay(100)
             live.refresh()
             handlerWaiting = false
-        }, 100)
+        }
     }
 }
 
@@ -153,25 +154,19 @@ class UserMetadata {
 }
 
 class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
-    val scope = CoroutineScope(Job() + Dispatchers.Main)
-
     fun refresh() {
         postValue(UserState(user))
     }
 
     override fun onActive() {
         super.onActive()
-        scope.launch {
         NostrSingleUserDataSource.add(user.pubkeyHex)
     }
-    }
 
     override fun onInactive() {
         super.onInactive()
-        scope.launch {
         NostrSingleUserDataSource.remove(user.pubkeyHex)
     }
-    }
 }
 
 class UserState(val user: User)

app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt

@@ -41,7 +41,7 @@ object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {
     return JsonFilter(
       kinds = listOf(MetadataEvent.kind),
       authors = listOf(account.userProfile().pubkeyHex),
-      limit = 1
+      limit = 3
     )
   }
 

app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt

@@ -20,6 +20,7 @@ import kotlin.time.measureTimedValue
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import nostr.postr.events.ContactListEvent
 import nostr.postr.events.DeletionEvent
@@ -118,7 +119,7 @@ abstract class NostrDataSource<T>(val debugName: String) {
     val returningList = feed().take(100)
 
     // prepare previews
-    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
     scope.launch {
       loadPreviews(returningList)
     }
@@ -147,17 +148,18 @@ abstract class NostrDataSource<T>(val debugName: String) {
     channelIds.remove(channel.id)
   }
 
-  val filterHandler = Handler(Looper.getMainLooper())
+  val scope = CoroutineScope(Job() + Dispatchers.IO)
   var handlerWaiting = false
   @Synchronized
   fun invalidateFilters() {
     if (handlerWaiting) return
 
     handlerWaiting = true
-    filterHandler.postDelayed({
+    scope.launch {
+      delay(200)
       resetFilters()
       handlerWaiting = false
-    }, 200)
+    }
   }
 
   fun resetFilters() {

app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt

@@ -16,7 +16,7 @@ object NostrSingleUserDataSource: NostrDataSource<Note>("SingleUserFeed") {
       JsonFilter(
         kinds = listOf(MetadataEvent.kind),
         authors = listOf(it.substring(0, 8)),
-        limit = 1
+        limit = 10
       )
     }
   }

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt

@@ -49,7 +49,10 @@ fun DrawerContent(navController: NavHostController,
                   accountViewModel: AccountViewModel,
                   accountStateViewModel: AccountStateViewModel) {
 
-    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val accountUserState by account.userProfile().live.observeAsState()
     val accountUser = accountUserState?.user
 
     Surface(
@@ -64,14 +67,18 @@ fun DrawerContent(navController: NavHostController,
                         model = banner,
                         contentDescription = "Profile Image",
                         contentScale = ContentScale.FillWidth,
-                        modifier = Modifier.fillMaxWidth().height(150.dp)
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(150.dp)
                     )
                 } else {
                     Image(
                         painter = painterResource(R.drawable.profile_banner),
                         contentDescription = "Profile Banner",
                         contentScale = ContentScale.FillWidth,
-                        modifier = Modifier.fillMaxWidth().height(150.dp)
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(150.dp)
                     )
                 }
 
@@ -106,12 +113,15 @@ fun DrawerContent(navController: NavHostController,
 fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier, scaffoldState: ScaffoldState, navController: NavController) {
     val coroutineScope = rememberCoroutineScope()
 
+    println("AAA " + accountUser?.profilePicture())
+
     Column(modifier = modifier) {
         AsyncImage(
             model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
             contentDescription = "Profile Image",
             modifier = Modifier
-                .width(100.dp).height(100.dp)
+                .width(100.dp)
+                .height(100.dp)
                 .clip(shape = CircleShape)
                 .border(3.dp, MaterialTheme.colors.background, CircleShape)
                 .background(MaterialTheme.colors.background)
@@ -205,7 +215,8 @@ fun NavigationRow(navController: NavHostController, scaffoldState: ScaffoldState
         })
     ) {
         Row(
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
                 .padding(vertical = 15.dp, horizontal = 25.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt

@@ -14,6 +14,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -26,8 +27,13 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     private var lastNotes: List<Note>? = null
 
     fun refresh() {
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
         scope.launch {
+            refreshSuspended()
+        }
+    }
+
+    private fun refreshSuspended() {
         val notes = dataSource.loadTop()
 
         val lastNotesCopy = lastNotes
@@ -45,7 +51,6 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
             updateFeed(cards)
         }
     }
-    }
 
     private fun convertToCard(notes: List<Note>): List<Card> {
         val reactionsPerEvent = mutableMapOf<Note, MutableList<Note>>()
@@ -76,31 +81,28 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     }
 
     fun updateFeed(notes: List<Card>) {
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
             if (notes.isEmpty()) {
                 _feedContent.update { CardFeedState.Empty }
             } else {
                 _feedContent.update { CardFeedState.Loaded(notes) }
             }
         }
-
-    fun refreshCurrentList() {
-        val state = feedContent.value
-        if (state is CardFeedState.Loaded) {
-            _feedContent.update { CardFeedState.Loaded(state.feed) }
-        }
     }
 
-    val filterHandler = Handler(Looper.getMainLooper())
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
     var handlerWaiting = false
     @Synchronized
     fun invalidateData() {
         if (handlerWaiting) return
 
         handlerWaiting = true
-        filterHandler.postDelayed({
+        scope.launch {
+            delay(100)
             refresh()
             handlerWaiting = false
-        }, 100)
+        }
     }
 
     private val cacheListener: (LocalCacheState) -> Unit = {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt

@@ -23,6 +23,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -42,8 +43,13 @@ abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel()
     val feedContent = _feedContent.asStateFlow()
 
     fun refresh() {
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
         scope.launch {
+            refreshSuspended()
+        }
+    }
+
+    private fun refreshSuspended() {
         val notes = dataSource.loadTop()
 
         val oldNotesState = feedContent.value
@@ -55,15 +61,17 @@ abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel()
             updateFeed(notes)
         }
     }
-    }
 
     fun updateFeed(notes: List<Note>) {
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
             if (notes.isEmpty()) {
                 _feedContent.update { FeedState.Empty }
             } else {
                 _feedContent.update { FeedState.Loaded(notes) }
             }
         }
+    }
 
     fun refreshCurrentList() {
         val state = feedContent.value
@@ -72,17 +80,18 @@ abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel()
         }
     }
 
-    val filterHandler = Handler(Looper.getMainLooper())
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
     var handlerWaiting = false
     @Synchronized
     fun invalidateData() {
         if (handlerWaiting) return
 
         handlerWaiting = true
-        filterHandler.postDelayed({
+        scope.launch {
+            delay(100)
             refresh()
             handlerWaiting = false
-        }, 100)
+        }
     }
 
     private val cacheListener: (LocalCacheState) -> Unit = {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt

@@ -14,6 +14,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -32,8 +33,13 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()
     val feedContent = _feedContent.asStateFlow()
 
     fun refresh() {
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
         scope.launch {
+            refreshSuspended()
+        }
+    }
+
+    private fun refreshSuspended() {
         val notes = dataSource.loadTop()
 
         val oldNotesState = feedContent.value
@@ -45,15 +51,17 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()
             updateFeed(notes)
         }
     }
-    }
 
     fun updateFeed(notes: List<User>) {
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
             if (notes.isEmpty()) {
                 _feedContent.update { UserFeedState.Empty }
             } else {
                 _feedContent.update { UserFeedState.Loaded(notes) }
             }
         }
+    }
 
     fun refreshCurrentList() {
         val state = feedContent.value
@@ -62,17 +70,18 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()
         }
     }
 
-    val filterHandler = Handler(Looper.getMainLooper())
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
     var handlerWaiting = false
     @Synchronized
     fun invalidateData() {
         if (handlerWaiting) return
 
         handlerWaiting = true
-        filterHandler.postDelayed({
+        scope.launch {
+            delay(100)
             refresh()
             handlerWaiting = false
-        }, 100)
+        }
     }
 
     private val cacheListener: (LocalCacheState) -> Unit = {