Adds more main thread checks to make sure slow procedures are run outside the main thread.

2023-06-07 12:08:13 -04:00 · 2023-06-07 12:08:13 -04:00 · c499c4baec
commit c499c4baec
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.nip19.Nip19
@ -179,6 +180,7 @@ open class Note(val idHex: String) {

    @Synchronized
    fun addZap(zapRequest: Note, zap: Note?) {
+        checkNotInMainThread()
        if (zapRequest !in zaps.keys) {
            zaps = zaps + Pair(zapRequest, zap)
            liveSet?.zaps?.invalidateData()
@ -190,6 +192,7 @@ open class Note(val idHex: String) {

    @Synchronized
    fun addZapPayment(zapPaymentRequest: Note, zapPayment: Note?) {
+        checkNotInMainThread()
        if (zapPaymentRequest !in zapPayments.keys) {
            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
            liveSet?.zaps?.invalidateData()
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.model

+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.ATag
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
@ -35,6 +36,8 @@ class ThreadAssembler {

    @OptIn(ExperimentalTime::class)
    fun findThreadFor(noteId: String): Set<Note> {
+        checkNotInMainThread()
+
        val (result, elapsed) = measureTimedValue {
            val note = if (noteId.contains(":")) {
                val aTag = ATag.parse(noteId, null)
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt
@ -33,6 +33,8 @@ class Nip05Verifier() {
    }

    private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
+
        val url = assembleUrl(nip05)

        if (url == null) {
@ -70,6 +72,7 @@ class Nip05Verifier() {
    }

    fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
        val mapper = jacksonObjectMapper()

        fetchNip05Json(
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service.lnurl
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@ -45,6 +46,8 @@ class LightningAddressResolver() {
    }

    private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
+
        val url = assembleUrl(lnaddress)

        if (url == null) {
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LnInvoiceUtil.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LnInvoiceUtil.kt
@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.lnurl

+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import java.math.BigDecimal
 import java.util.Locale
 import java.util.regex.Pattern
@ -98,7 +99,7 @@ object LnInvoiceUtil {
     * @return invoice amount in bitcoins, zero if the invoice has no amount
     * @throws RuntimeException if invoice format is incorrect
     */
-    fun getAmount(invoice: String): BigDecimal {
+    private fun getAmount(invoice: String): BigDecimal {
        try {
            decodeUnlimitedLength(invoice) // checksum must match
        } catch (e: AddressFormatException) {
@ -121,6 +122,8 @@ object LnInvoiceUtil {
    }

    fun getAmountInSats(invoice: String): BigDecimal {
+        checkNotInMainThread()
+
        return getAmount(invoice).multiply(BigDecimal(100000000))
    }

--- a/app/src/main/java/com/vitorpamplona/amethyst/service/previews/BahaUrlPreview.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/previews/BahaUrlPreview.kt
@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.previews

 import android.net.Uri
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.*
 import java.util.*

@ -18,6 +19,7 @@ class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
    }

    private suspend fun fetch(timeOut: Int = 30000) {
+        checkNotInMainThread()
        lateinit var urlInfoItem: UrlInfoItem
        if (checkIsImageUrl()) {
            urlInfoItem = UrlInfoItem(url = url, image = url)
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
@ -72,6 +72,8 @@ class Relay(
    fun requestAndWatch() {
        checkNotInMainThread()
        requestAndWatch {
+            checkNotInMainThread()
+
            // Sends everything.
            Client.allSubscriptions().forEach {
                sendFilter(requestId = it)
@ -92,6 +94,8 @@ class Relay(
            val listener = object : WebSocketListener() {

                override fun onOpen(webSocket: WebSocket, response: Response) {
+                    checkNotInMainThread()
+
                    afterEOSE = false
                    isReady = true
                    ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
@ -102,6 +106,8 @@ class Relay(
                }

                override fun onMessage(webSocket: WebSocket, text: String) {
+                    checkNotInMainThread()
+
                    eventDownloadCounterInBytes += text.bytesUsedInMemory()

                    try {
@ -156,6 +162,8 @@ class Relay(
                }

                override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+                    checkNotInMainThread()
+
                    listeners.forEach {
                        it.onRelayStateChange(
                            this@Relay,
@ -166,6 +174,8 @@ class Relay(
                }

                override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                    checkNotInMainThread()
+
                    socket = null
                    isReady = false
                    afterEOSE = false
@ -174,6 +184,8 @@ class Relay(
                }

                override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                    checkNotInMainThread()
+
                    errorCounter++

                    socket?.close(1000, "Normal close")
@ -212,6 +224,8 @@ class Relay(
    }

    fun sendFilter(requestId: String) {
+        checkNotInMainThread()
+
        if (read) {
            if (isConnected()) {
                if (isReady) {
@ -236,6 +250,8 @@ class Relay(
    }

    fun sendFilterOnlyIfDisconnected() {
+        checkNotInMainThread()
+
        if (socket == null) {
            // waits 60 seconds to reconnect after disconnected.
            if (Date().time / 1000 > closingTime + 60) {
@ -246,6 +262,8 @@ class Relay(
    }

    fun send(signedEvent: EventInterface) {
+        checkNotInMainThread()
+
        if (signedEvent is RelayAuthEvent) {
            val event = """["AUTH",${signedEvent.toJson()}]"""
            socket?.send(event)
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt
@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.relays

 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.EventInterface
 import kotlinx.coroutines.CoroutineScope
@ -48,6 +49,8 @@ object RelayPool : Relay.Listener {
    }

    fun requestAndWatch() {
+        checkNotInMainThread()
+
        relays.forEach { it.requestAndWatch() }
    }

--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt
@ -58,6 +58,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.ChannelName
 import com.vitorpamplona.amethyst.ui.note.UserPicture
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
@ -158,6 +159,7 @@ private fun RenderSearch(
    LaunchedEffect(Unit) {
        launch(Dispatchers.IO) {
            LocalCache.live.newEventBundles.collect {
+                checkNotInMainThread()
                if (searchBarViewModel.isSearchingFun()) {
                    searchBarViewModel.invalidateData()
                }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/BundledUpdate.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/BundledUpdate.kt
@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components

+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@ -58,6 +59,8 @@ class BundledInsert<T>(
    private var queue = LinkedBlockingQueue<T>()

    fun invalidateList(newObject: T, onUpdate: suspend (Set<T>) -> Unit) {
+        checkNotInMainThread()
+
        queue.put(newObject)
        if (onlyOneInBlock.getAndSet(true)) {
            return
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt
@ -12,6 +12,7 @@ import coil.fetch.SourceResult
 import coil.request.ImageRequest
 import coil.request.Options
 import coil.size.Size
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import okio.Buffer
 import java.security.MessageDigest

@ -67,6 +68,7 @@ class HashImageFetcher(
 ) : Fetcher {

    override suspend fun fetch(): SourceResult {
+        checkNotInMainThread()
        val source = try {
            Buffer().apply { write(svgString(data.toString()).toByteArray()) }
        } finally {
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt
@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui.dal

-import android.util.Log
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
@ -84,7 +83,7 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
            sort(myNewList.toSet()).take(1000)
        }

-        Log.d("Time", "${this.javaClass.simpleName} Modified Additive Feed in $elapsed with ${feed.size} objects")
+        // Log.d("Time", "${this.javaClass.simpleName} Modified Additive Feed in $elapsed with ${feed.size} objects")
        return feed
    }

--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt
@ -39,6 +39,7 @@ import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@ -295,6 +296,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {

            collectorJob = viewModelScope.launch(Dispatchers.IO) {
                LocalCache.live.newEventBundles.collect { newNotes ->
+                    checkNotInMainThread()
+
                    invalidateInsertData(newNotes)
                }
            }
@ -310,6 +313,7 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
    }

    override fun onCleared() {
+        collectorJob?.cancel()
        super.onCleared()
    }

--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
@ -314,6 +314,8 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
    init {
        collectorJob = viewModelScope.launch(Dispatchers.IO) {
            LocalCache.live.newEventBundles.collect { newNotes ->
+                checkNotInMainThread()
+
                if (localFilter is AdditiveFeedFilter && _feedContent.value is CardFeedState.Loaded) {
                    invalidateInsertData(newNotes)
                } else {
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
@ -246,6 +246,8 @@ abstract class FeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel(), I
    init {
        collectorJob = viewModelScope.launch(Dispatchers.IO) {
            LocalCache.live.newEventBundles.collect { newNotes ->
+                checkNotInMainThread()
+
                if (localFilter is AdditiveFeedFilter &&
                    (_feedContent.value is FeedState.Loaded || _feedContent.value is FeedState.Empty)
                ) {
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt
@ -85,6 +85,8 @@ open class LnZapFeedViewModel(val dataSource: FeedFilter<ZapReqResponse>) : View

    init {
        collectorJob = viewModelScope.launch(Dispatchers.IO) {
+            checkNotInMainThread()
+
            LocalCache.live.newEventBundles.collect { newNotes ->
                invalidateData()
            }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
@ -105,6 +105,8 @@ open class UserFeedViewModel(val dataSource: FeedFilter<User>) : ViewModel(), In

    init {
        collectorJob = viewModelScope.launch(Dispatchers.IO) {
+            checkNotInMainThread()
+
            LocalCache.live.newEventBundles.collect { newNotes ->
                invalidateData()
            }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
@ -58,6 +58,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.AboutDisplay
 import com.vitorpamplona.amethyst.ui.note.ChannelName
@ -231,6 +232,8 @@ private fun SearchBar(
    LaunchedEffect(Unit) {
        launch(Dispatchers.IO) {
            LocalCache.live.newEventBundles.collect {
+                checkNotInMainThread()
+
                if (searchBarViewModel.isSearchingFun()) {
                    searchBarViewModel.invalidateData()
                }