Activating the Atomic Boolean instead of Synchronized sections

app/src/main/java/com/vitorpamplona/amethyst/NotificationCache.kt

@@ -44,12 +44,10 @@ class NotificationLiveData(val cache: NotificationCache): LiveData<NotificationS
   // Refreshes observers in batches.
   var handlerWaiting = AtomicBoolean()
 
-  @Synchronized
   fun invalidateData() {
     if (!hasActiveObservers()) return
     if (handlerWaiting.getAndSet(true)) return
 
-    handlerWaiting.set(true)
     val scope = CoroutineScope(Job() + Dispatchers.Main)
     scope.launch {
       try {

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

@@ -605,11 +605,9 @@ class Account(
 class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {
   var handlerWaiting = AtomicBoolean()
 
-  @Synchronized
   fun invalidateData() {
     if (handlerWaiting.getAndSet(true)) return
 
-    handlerWaiting.set(true)
     val scope = CoroutineScope(Job() + Dispatchers.Default)
     scope.launch {
       try {

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

@@ -67,12 +67,10 @@ class AntiSpamLiveData(val cache: AntiSpamFilter): LiveData<AntiSpamState>(AntiS
   // Refreshes observers in batches.
   var handlerWaiting = AtomicBoolean()
 
-  @Synchronized
   fun invalidateData() {
     if (!hasActiveObservers()) return
     if (handlerWaiting.getAndSet(true)) return
 
-    handlerWaiting.set(true)
     val scope = CoroutineScope(Job() + Dispatchers.Main)
     scope.launch {
       try {

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

@@ -23,7 +23,6 @@ class Channel(val idHex: String) {
         return info.name ?: idDisplayNote()
     }
 
-    @Synchronized
     fun addNote(note: Note) {
         notes[note.idHex] = note
     }

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

@@ -735,12 +735,10 @@ class LocalCacheLiveData(val cache: LocalCache): LiveData<LocalCacheState>(Local
   // Refreshes observers in batches.
   var handlerWaiting = AtomicBoolean()
 
-  @Synchronized
   fun invalidateData() {
     if (!hasActiveObservers()) return
     if (handlerWaiting.getAndSet(true)) return
 
-    handlerWaiting.set(true)
     val scope = CoroutineScope(Job() + Dispatchers.Main)
     scope.launch {
       try {

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

@@ -18,8 +18,10 @@ import java.util.regex.Pattern
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import nostr.postr.events.Event
 
 val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
@@ -318,17 +320,20 @@ class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
     var handlerWaiting = AtomicBoolean()
 
-    @Synchronized
     fun invalidateData() {
         if (!hasActiveObservers()) return
         if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Main)
         scope.launch {
-            delay(100)
+            try {
-            refresh()
+                delay(100)
-            handlerWaiting.set(false)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
         }
     }
 

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

@@ -379,11 +379,9 @@ class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
     var handlerWaiting = AtomicBoolean()
 
-    @Synchronized
     fun invalidateData() {
         if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Main)
         scope.launch {
             try {

app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt

@@ -94,7 +94,6 @@ object RelayPool: Relay.Listener {
         fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay)
     }
 
-    @Synchronized
     override fun onEvent(relay: Relay, subscriptionId: String, event: Event) {
         listeners.forEach { it.onEvent(event, subscriptionId, relay) }
     }

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

@@ -129,11 +129,9 @@ open class CardFeedViewModel(val dataSource: FeedFilter<Note>): ViewModel() {
 
     var handlerWaiting = AtomicBoolean()
 
-    @Synchronized
     private fun invalidateData() {
         if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
             try {

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

@@ -87,11 +87,10 @@ abstract class FeedViewModel(val localFilter: FeedFilter<Note>): ViewModel() {
     }
 
     private var handlerWaiting = AtomicBoolean()
-    @Synchronized
+
     fun invalidateData() {
         if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
             try {

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

@@ -61,11 +61,9 @@ open class LnZapFeedViewModel(val dataSource: FeedFilter<Pair<Note, Note>>): Vie
 
     var handlerWaiting = AtomicBoolean()
 
-    @Synchronized
     private fun invalidateData() {
         if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
             try {

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

@@ -83,11 +83,9 @@ class RelayFeedViewModel: ViewModel() {
 
     var handlerWaiting = AtomicBoolean()
 
-    @Synchronized
     private fun invalidateData() {
         if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
             try {

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

@@ -65,11 +65,9 @@ open class UserFeedViewModel(val dataSource: FeedFilter<User>): ViewModel() {
 
     var handlerWaiting = AtomicBoolean()
 
-    @Synchronized
     private fun invalidateData() {
         if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
             try {