nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Moves all Dispatchers.Default to IO because of the amount of Synchronized code that blocks the thread underneath each coroutine and since Default only has the exact number of threads the processor offers, once they block, we lose computing power

Browse Source
This commit is contained in:
Vitor Pamplona
2025-10-21 18:30:08 -04:00
parent d8907e3dfb
commit df54f7bb67
112 changed files with 231 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/AppModules.kt
+1 -1
View File
@@ -86,7 +86,7 @@ class AppModules(
}
val applicationIOScope = CoroutineScope(Dispatchers.IO + SupervisorJob() + exceptionHandler)
val applicationDefaultScope = CoroutineScope(Dispatchers.Default + SupervisorJob() + exceptionHandler)
val applicationDefaultScope = CoroutineScope(Dispatchers.IO + SupervisorJob() + exceptionHandler)
// Blocking load of UI Preferences to avoid theme/language blinking
val uiPrefs by lazy {
amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+1 -1
View File
@@ -1761,7 +1761,7 @@ class Account(
fun observeDonatedInThisVersion() =
settings
.observeDonatedInVersion(BuildConfig.VERSION_NAME)
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(scope, SharingStarted.Eagerly, hasDonatedInThisVersion())
fun markDonatedInThisVersion() = settings.markDonatedInThisVersion(BuildConfig.VERSION_NAME)
amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+3 -3
View File
@@ -1962,7 +1962,7 @@ object LocalCache : ILocalCache {
requestNote?.let { request -> zappedNote?.addZapPayment(request, note) }
GlobalScope.launch(Dispatchers.Default) {
GlobalScope.launch(Dispatchers.IO) {
responseCallback(event)
}
@@ -2913,10 +2913,10 @@ class LocalCacheFlow {
val deletedEventBundles = _deletedEventBundles.asSharedFlow() // read-only public view
// Refreshes observers in batches.
private val bundler = BundledInsert<Note>(1000, Dispatchers.Default)
private val bundler = BundledInsert<Note>(1000, Dispatchers.IO)
// Refreshes observers in batches.
private val bundler2 = BundledInsert<Note>(1000, Dispatchers.Default)
private val bundler2 = BundledInsert<Note>(1000, Dispatchers.IO)
fun newNote(newNote: Note) {
bundler.invalidateList(newNote) { bundledNewNotes ->
amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt
+1 -1
View File
@@ -97,7 +97,7 @@ class AccountCacheState(
client = client,
scope =
CoroutineScope(
Dispatchers.Default +
Dispatchers.IO +
SupervisorJob() +
CoroutineExceptionHandler { _, throwable ->
Log.e("AccountCacheState", "Account ${signer.pubKey} caught exception: ${throwable.message}", throwable)
amethyst/src/main/java/com/vitorpamplona/amethyst/model/edits/PrivateStorageRelayListState.kt
+2 -2
View File
@@ -66,7 +66,7 @@ class PrivateStorageRelayListState(
.map { normalizePrivateOutboxRelayListWithBackup(it.note) }
.onStart {
emit(normalizePrivateOutboxRelayListWithBackup(privateOutboxListNote))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -99,7 +99,7 @@ class PrivateStorageRelayListState(
}
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Private Home Relay List Collector Start")
getPrivateOutboxRelayListFlow().collect { noteState ->
Log.d("AccountRegisterObservers", "Updating Private Home Relay List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/emphChat/EphemeralChatListState.kt
+2 -2
View File
@@ -69,7 +69,7 @@ class EphemeralChatListState(
emit(ephemeralChatListWithBackup(noteState.note))
}.onStart {
emit(ephemeralChatListWithBackup(ephemeralChatListNote))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -117,7 +117,7 @@ class EphemeralChatListState(
}
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "EphemeralChatList Collector Start")
getEphemeralChatListFlow().collect { noteState ->
Log.d("AccountRegisterObservers", "EphemeralChatList List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/localRelays/LocalRelayListState.kt
+1 -1
View File
@@ -43,7 +43,7 @@ class LocalRelayListState(
val flow =
settings.localRelayServers
.map { normalizeLocalRelayListWithBackup(it) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/AccountHomeRelayState.kt
+1 -1
View File
@@ -43,7 +43,7 @@ class AccountHomeRelayState(
local.flow,
) { nip65Outbox, privateOutBox, localRelays ->
nip65Outbox + privateOutBox + localRelays
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/AccountOutboxRelayState.kt
+1 -1
View File
@@ -46,7 +46,7 @@ class AccountOutboxRelayState(
broadcast.flow,
) { nip65Outbox, privateOutBox, localRelays, broadcastRelays ->
nip65Outbox + privateOutBox + localRelays + broadcastRelays
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/NotificationInboxRelayState.kt
+1 -1
View File
@@ -40,7 +40,7 @@ class NotificationInboxRelayState(
localRelayList.flow,
) { nip65Inbox, localRelays ->
nip65Inbox + localRelays
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/UserMetadataState.kt
+1 -1
View File
@@ -113,7 +113,7 @@ class UserMetadataState(
}
// saves contact list for the next time.
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Kind 0 Collector Start")
getUserMetadataFlow().collect {
Log.d("AccountRegisterObservers", "Updating Kind 0 ${it.user.toBestDisplayName()}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/DeclaredFollowsPerOutboxRelay.kt
+1 -1
View File
@@ -55,7 +55,7 @@ class DeclaredFollowsPerOutboxRelay(
calculator.authorsPerRelaySnapshot(kind3Follows.flow.value.authors, cache) { it },
)
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowListOutboxOrProxyRelays.kt
+4 -4
View File
@@ -60,7 +60,7 @@ class FollowListOutboxOrProxyRelays(
OutboxRelayLoader(true).authorsPerRelaySnapshot(kind3Follows.flow.value.authors, cache) { it.keys },
)
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -72,7 +72,7 @@ class FollowListOutboxOrProxyRelays(
followList.minus(blockedRelays)
}.onStart {
emit(outboxRelayFlow.value.minus(blockedRelayList.flow.value.toSet()))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -94,7 +94,7 @@ class FollowListOutboxOrProxyRelays(
outboxRelayMinusBlockedFlow.value
},
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -108,7 +108,7 @@ class FollowListOutboxOrProxyRelays(
relayList.mapTo(mutableSetOf()) { it.url }
}.onStart {
emit(flow.value.mapTo(mutableSetOf()) { it.url })
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowListReusedOutboxOrProxyRelays.kt
+4 -4
View File
@@ -78,7 +78,7 @@ class FollowListReusedOutboxOrProxyRelays(
},
)
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -90,7 +90,7 @@ class FollowListReusedOutboxOrProxyRelays(
followList.minus(blockedRelays)
}.onStart {
emit(outboxRelayFlow.value.minus(blockedRelayList.flow.value.toSet()))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -112,7 +112,7 @@ class FollowListReusedOutboxOrProxyRelays(
outboxRelayMinusBlockedFlow.value
},
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -126,7 +126,7 @@ class FollowListReusedOutboxOrProxyRelays(
relayList.mapTo(mutableSetOf()) { it.url }
}.onStart {
emit(flow.value.mapTo(mutableSetOf()) { it.url })
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowListState.kt
+3 -3
View File
@@ -66,7 +66,7 @@ class FollowListState(
val flow =
innerFlow
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -81,7 +81,7 @@ class FollowListState(
it.authors.mapNotNull {
cache.checkGetOrCreateUser(it)
}
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -166,7 +166,7 @@ class FollowListState(
}
// saves contact list for the next time.
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Kind 3 Collector Start")
getFollowListFlow().collect {
Log.d("AccountRegisterObservers", "Updating Kind 3 ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowsPerOutboxRelay.kt
+3 -3
View File
@@ -60,7 +60,7 @@ class FollowsPerOutboxRelay(
OutboxRelayLoader().authorsPerRelaySnapshot(kind3Follows.flow.value.authors, cache) { it },
)
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -72,7 +72,7 @@ class FollowsPerOutboxRelay(
followList.minus(blockedRelays)
}.onStart {
emit(outboxPerRelayFlow.value.minus(blockedRelayList.flow.value.toSet()))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -96,7 +96,7 @@ class FollowsPerOutboxRelay(
} else {
emit(proxyRelayList.flow.value.associateWith { kind3Follows.flow.value.authors })
}
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip03Timestamp/IncomingOtsEventVerifier.kt
+1 -1
View File
@@ -42,7 +42,7 @@ class IncomingOtsEventVerifier(
newNotes.forEach {
consume(it)
}
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmInboxRelayState.kt
+1 -1
View File
@@ -47,7 +47,7 @@ class DmInboxRelayState(
localRelayList.flow,
) { nip65Inbox, dmRelayList, privateOutBox, localRelays ->
nip65Inbox + dmRelayList + privateOutBox + localRelays
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmRelayListState.kt
+2 -2
View File
@@ -64,7 +64,7 @@ class DmRelayListState(
getDMRelayListFlow()
.map { normalizeDMRelayListWithBackup(it.note) }
.onStart { emit(normalizeDMRelayListWithBackup(dmListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -96,7 +96,7 @@ class DmRelayListState(
}
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "NIP-17 Relay List Collector Start")
getDMRelayListFlow().collect {
Log.d("AccountRegisterObservers", "Updating DM Relay List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip28PublicChats/PublicChatListState.kt
+3 -3
View File
@@ -71,7 +71,7 @@ class PublicChatListState(
emit(publicChatListWithBackup(noteState.note))
}.onStart {
emit(publicChatListWithBackup(publicChatListNote))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -85,7 +85,7 @@ class PublicChatListState(
it.mapTo(mutableSetOf()) { it.eventId }
}.onStart {
emit(flow.value.mapTo(mutableSetOf()) { it.eventId })
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -132,7 +132,7 @@ class PublicChatListState(
}
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Channel List Collector Start")
getChannelListFlow().collect {
Log.d("AccountRegisterObservers", "Channel List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip30CustomEmojis/EmojiPackState.kt
+2 -2
View File
@@ -75,7 +75,7 @@ class EmojiPackState(
emit(convertEmojiSelectionPack(it.note.event as? EmojiPackSelectionEvent))
}.onStart {
emit(convertEmojiSelectionPack(getEmojiPackSelection()))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -120,7 +120,7 @@ class EmojiPackState(
)?.map { it.value }?.toTypedArray() ?: emptyArray(),
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip47WalletConnect/NwcSignerState.kt
+3 -3
View File
@@ -76,7 +76,7 @@ class NwcSignerState(
settings.zapPaymentRequest
.map {
buildSigner(it) ?: signer
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -91,7 +91,7 @@ class NwcSignerState(
nip47Signer
.map {
NostrWalletConnectRequestCache(it)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(scope, SharingStarted.Eagerly, NostrWalletConnectRequestCache(nip47Signer.value))
/**
@@ -102,7 +102,7 @@ class NwcSignerState(
nip47Signer
.map {
NostrWalletConnectResponseCache(it)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(scope, SharingStarted.Eagerly, NostrWalletConnectResponseCache(nip47Signer.value))
fun buildSigner(uri: Nip47WalletConnect.Nip47URINorm?) =
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/BookmarkListState.kt
+7 -7
View File
@@ -78,7 +78,7 @@ class BookmarkListState(
}.onStart {
emit(publicBookmarks(bookmarkList))
}.debounce(100)
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -93,7 +93,7 @@ class BookmarkListState(
}.onStart {
emit(privateBookmarks(bookmarkList))
}.debounce(100)
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -107,7 +107,7 @@ class BookmarkListState(
.mapNotNull {
if (it is EventBookmark) it.eventId else null
}.toSet()
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -121,7 +121,7 @@ class BookmarkListState(
.mapNotNull {
if (it is AddressBookmark) it.address else null
}.toSet()
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -135,7 +135,7 @@ class BookmarkListState(
.mapNotNull {
if (it is EventBookmark) it.eventId else null
}.toSet()
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -149,7 +149,7 @@ class BookmarkListState(
.mapNotNull {
if (it is AddressBookmark) it.address else null
}.toSet()
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -185,7 +185,7 @@ class BookmarkListState(
emit(bookmarkList(private, public))
}.onStart {
emit(bookmarkList(privateBookmarks.value, publicBookmarks.value))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/HiddenUsersState.kt
+1 -1
View File
@@ -93,7 +93,7 @@ class HiddenUsersState(
settings.syncedSettings.security.showSensitiveContent.value,
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockPeopleList/BlockPeopleListState.kt
+1 -1
View File
@@ -61,7 +61,7 @@ class BlockPeopleListState(
getBlockListFlow()
.map { blockListWithBackup(it.note) }
.onStart { emit(blockListWithBackup(blockListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockedRelays/BlockedRelayListState.kt
+2 -2
View File
@@ -67,7 +67,7 @@ class BlockedRelayListState(
.map {
normalizeBlockedRelayListWithBackup(it.note)
}.onStart { emit(normalizeBlockedRelayListWithBackup(blockedListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -99,7 +99,7 @@ class BlockedRelayListState(
GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Blocked Relay List Collector Start")
getBlockedRelayListFlow().collect {
Log.d("AccountRegisterObservers", "Updating Blocked Relay List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/broadcastRelays/BroadcastRelayListState.kt
+1 -1
View File
@@ -61,7 +61,7 @@ class BroadcastRelayListState(
getBroadcastRelayListFlow()
.map { normalizeBroadcastRelayListWithBackup(it.note) }
.onStart { emit(normalizeBroadcastRelayListWithBackup(broadcastListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListDecryptionCache.kt
+1 -1
View File
@@ -72,5 +72,5 @@ class GeohashListDecryptionCache(
emit(EmptyGeohashListCard)
}
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt
+2 -2
View File
@@ -68,7 +68,7 @@ class GeohashListState(
emit(geohashListWithBackup(noteState.note))
}.onStart {
emit(geohashListWithBackup(geohashListNote))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -114,7 +114,7 @@ class GeohashListState(
}
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Geohash List Collector Start")
getGeohashListFlow().collect { noteState ->
Log.d("AccountRegisterObservers", "Geohash List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt
+2 -2
View File
@@ -68,7 +68,7 @@ class HashtagListState(
emit(hashtagListWithBackup(noteState.note))
}.onStart {
emit(hashtagListWithBackup(hashtagListNote))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Companion.Eagerly,
@@ -114,7 +114,7 @@ class HashtagListState(
}
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Hashtag List Collector Start")
getHashtagListFlow().collect {
Log.d("AccountRegisterObservers", "Hashtag List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/indexerRelays/IndexerRelayListState.kt
+3 -3
View File
@@ -67,7 +67,7 @@ class IndexerRelayListState(
getIndexerRelayListFlow()
.map { normalizeIndexerRelayListWithBackup(it.note) }
.onStart { emit(normalizeIndexerRelayListWithBackup(indexerListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -78,7 +78,7 @@ class IndexerRelayListState(
getIndexerRelayListFlow()
.map { normalizeIndexerRelayListWithBackupNoDefaults(it.note) }
.onStart { emit(normalizeIndexerRelayListWithBackupNoDefaults(indexerListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -109,7 +109,7 @@ class IndexerRelayListState(
GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Index Relay List Collector Start")
getIndexerRelayListFlow().collect {
Log.d("AccountRegisterObservers", "Updating Index Relay List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/muteList/MuteListState.kt
+2 -2
View File
@@ -67,7 +67,7 @@ class MuteListState(
getMuteListFlow()
.map { muteListWithBackup(it.note) }
.onStart { emit(muteListWithBackup(muteListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -149,7 +149,7 @@ class MuteListState(
}
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Mute List Collector Start")
getMuteListFlow().collect {
Log.d("AccountRegisterObservers", "Updating Mute List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/proxyRelays/ProxyRelayListState.kt
+1 -1
View File
@@ -61,7 +61,7 @@ class ProxyRelayListState(
getProxyRelayListFlow()
.map { normalizeProxyRelayListWithBackup(it.note) }
.onStart { emit(normalizeProxyRelayListWithBackup(proxyListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/relayLists/GenericRelayListCache.kt
+1 -1
View File
@@ -72,5 +72,5 @@ open class GenericRelayListCache<T : PrivateTagArrayEvent>(
emit(EmptyRelayListCard)
}
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/searchRelays/SearchRelayListState.kt
+3 -3
View File
@@ -67,7 +67,7 @@ class SearchRelayListState(
getSearchRelayListFlow()
.map { normalizeSearchRelayListWithBackup(it.note) }
.onStart { emit(normalizeSearchRelayListWithBackup(searchListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Companion.Eagerly,
@@ -78,7 +78,7 @@ class SearchRelayListState(
getSearchRelayListFlow()
.map { normalizeSearchRelayListWithBackupNoDefaults(it.note) }
.onStart { emit(normalizeSearchRelayListWithBackupNoDefaults(searchListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -109,7 +109,7 @@ class SearchRelayListState(
GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Search Relay List Collector Start")
getSearchRelayListFlow().collect {
Log.d("AccountRegisterObservers", "Updating Search Relay List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/trustedRelays/TrustedRelayListState.kt
+2 -2
View File
@@ -65,7 +65,7 @@ class TrustedRelayListState(
getTrustedRelayListFlow()
.map { normalizeTrustedRelayListWithBackup(it.note) }
.onStart { emit(normalizeTrustedRelayListWithBackup(trustedListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Companion.Eagerly,
@@ -96,7 +96,7 @@ class TrustedRelayListState(
GlobalScope.launch(Dispatchers.IO) { cache.justConsumeMyOwnEvent(it) }
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Trusted Relay List Collector Start")
getTrustedRelayListFlow().collect {
Log.d("AccountRegisterObservers", "Updating Trusted Relay List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt
+4 -4
View File
@@ -71,7 +71,7 @@ class Nip65RelayListState(
getNIP65RelayListFlow()
.map { normalizeNIP65WriteRelayListWithBackup(it.note) }
.onStart { emit(normalizeNIP65ReadRelayListWithBackup(nip65ListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -82,7 +82,7 @@ class Nip65RelayListState(
getNIP65RelayListFlow()
.map { normalizeNIP65ReadRelayListWithBackup(it.note) }
.onStart { emit(normalizeNIP65ReadRelayListWithBackup(nip65ListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -93,7 +93,7 @@ class Nip65RelayListState(
getNIP65RelayListFlow()
.map { normalizeNIP65AllRelayListWithBackupNoDefaults(it.note) }
.onStart { emit(normalizeNIP65AllRelayListWithBackupNoDefaults(nip65ListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -124,7 +124,7 @@ class Nip65RelayListState(
GlobalScope.launch(Dispatchers.IO) { cache.justConsumeMyOwnEvent(it) }
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "NIP-65 Relay List Collector Start")
getNIP65RelayListFlow().collect {
Log.d("AccountRegisterObservers", "Updating NIP-65 List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip72Communities/CommunityListState.kt
+3 -3
View File
@@ -72,7 +72,7 @@ class CommunityListState(
emit(communityListWithBackup(noteState.note))
}.onStart {
emit(communityListWithBackup(communityListNote))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -86,7 +86,7 @@ class CommunityListState(
hint.mapTo(mutableSetOf()) { it.address.toValue() }
}.onStart {
emit(flow.value.mapTo(mutableSetOf()) { it.address.toValue() })
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -147,7 +147,7 @@ class CommunityListState(
}
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "Community List Collector Start")
getCommunityListFlow().collect {
Log.d("AccountRegisterObservers", "Community List for ${signer.pubKey}")
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip78AppSpecific/AppSpecificState.kt
+1 -1
View File
@@ -81,7 +81,7 @@ class AppSpecificState(
}
}
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
Log.d("AccountRegisterObservers", "AppSpecificData Collector Start")
getAppSpecificDataFlow().collect {
try {
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip96FileStorage/FileStorageServerListState.kt
+1 -1
View File
@@ -59,7 +59,7 @@ class FileStorageServerListState(
getFileServersListFlow()
.map { normalizeServers(it.note) }
.onStart { emit(normalizeServers(fileStorageListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nipB7Blossom/BlossomServerListState.kt
+1 -1
View File
@@ -61,7 +61,7 @@ class BlossomServerListState(
getBlossomServersListFlow()
.map { normalizeServers(it.note) }
.onStart { emit(normalizeServers(blossomListNote)) }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/preferences/UpdatablePropertyFlow.kt
+1 -1
View File
@@ -34,7 +34,7 @@ class UpdatablePropertyFlow<T>(
) {
val stateFlow =
flow
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope = scope,
started = SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/MergedFollowListsState.kt
+1 -1
View File
@@ -79,7 +79,7 @@ class MergedFollowListsState(
),
)
}.sample(200)
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/MergedFollowPlusMineRelayListsState.kt
+1 -1
View File
@@ -65,7 +65,7 @@ class MergedFollowPlusMineRelayListsState(
),
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/MergedFollowPlusMineWithIndexRelayListsState.kt
+1 -1
View File
@@ -69,7 +69,7 @@ class MergedFollowPlusMineWithIndexRelayListsState(
),
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/MergedFollowPlusMineWithSearchRelayListsState.kt
+1 -1
View File
@@ -69,7 +69,7 @@ class MergedFollowPlusMineWithSearchRelayListsState(
),
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/MergedServerListState.kt
+1 -1
View File
@@ -64,7 +64,7 @@ class MergedServerListState(
mergeServerList(nip96s, blossoms)
}.onStart {
emit(mergeServerList(fileServers.flow.value, blossomServers.flow.value))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/TrustedRelayListsState.kt
+1 -1
View File
@@ -75,7 +75,7 @@ class TrustedRelayListsState(
),
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/topNavFeeds/FeedTopNavFilterState.kt
+1 -1
View File
@@ -81,7 +81,7 @@ class FeedTopNavFilterState(
emitAll(loadFlowsFor(listName).flow())
}.onStart {
loadFlowsFor(feedFilterListName.value).startValue(this)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/topNavFeeds/MergedTopFeedAuthorListsState.kt
+1 -1
View File
@@ -100,7 +100,7 @@ class MergedTopFeedAuthorListsState(
notificationNavFilter.value,
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/topNavFeeds/OutboxLoaderState.kt
+1 -1
View File
@@ -45,7 +45,7 @@ class OutboxLoaderState(
emitAll(filterSettings.toPerRelayFlow(cache))
}.onStart {
emit(topNavFilter.value.startValue(cache))
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Companion.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/model/torState/TorRelayState.kt
+2 -2
View File
@@ -74,7 +74,7 @@ class TorRelayState(
trustedRelaysViaTor = torSettingsFlow.trustedRelaysViaTor.value,
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
@@ -108,7 +108,7 @@ class TorRelayState(
dmRelayList = dmRelays.value,
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
scope,
SharingStarted.Eagerly,
amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/PokeyReceiver.kt
+1 -1
View File
@@ -47,7 +47,7 @@ class PokeyReceiver : BroadcastReceiver() {
Log.e("AmethystCoroutine", "Caught exception: ${throwable.message}", throwable)
}
val scope = CoroutineScope(Dispatchers.Default + SupervisorJob() + exceptionHandler)
val scope = CoroutineScope(Dispatchers.IO + SupervisorJob() + exceptionHandler)
fun register(app: Context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt
+1 -1
View File
@@ -76,7 +76,7 @@ class OkHttpWebSocket(
inner class OkHttpWebsocketListener(
val out: WebSocketListener,
) : okhttp3.WebSocketListener() {
val scope = CoroutineScope(Dispatchers.Default + exceptionHandler)
val scope = CoroutineScope(Dispatchers.IO + exceptionHandler)
val incomingMessages: Channel<String> = Channel(Channel.UNLIMITED)
val job = // Launch a coroutine to process messages from the channel.
scope.launch {
amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/MuteButton.kt
+1 -1
View File
@@ -65,7 +65,7 @@ fun MuteButton(
}
LaunchedEffect(key1 = controllerVisible) {
launch(Dispatchers.Default) {
launch(Dispatchers.IO) {
delay(2000)
holdOn.value = false
}
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt
+1 -1
View File
@@ -55,7 +55,7 @@ abstract class BaseEoseManager<T>(
fun dismissSubscription(subId: String) = orchestrator.dismissSubscription(subId)
// Refreshes observers in batches.
private val bundler = BundledUpdate(sampleTime, Dispatchers.Default)
private val bundler = BundledUpdate(sampleTime, Dispatchers.IO)
override fun invalidateFilters(ignoreIfDoing: Boolean) {
bundler.invalidate(ignoreIfDoing, ::forceInvalidate)
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/drafts/AccountDraftsEoseManager.kt
+1 -1
View File
@@ -63,7 +63,7 @@ class AccountDraftsEoseManager(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
relayFlow(key).collectLatest {
invalidateFilters()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/follows/AccountFollowsLoaderSubAssembler.kt
+2 -2
View File
@@ -67,7 +67,7 @@ class AccountFollowsLoaderSubAssembler(
private val orchestrator = SubscriptionController(client)
// Refreshes observers in batches of 500ms
private val bundler = BundledUpdate(500, Dispatchers.Default)
private val bundler = BundledUpdate(500, Dispatchers.IO)
/**
* This assembler saves the EOSE per user key. That EOSE includes their metadata, etc
@@ -203,7 +203,7 @@ class AccountFollowsLoaderSubAssembler(
) {
accountUpdatesJobMap[user]?.cancel()
accountUpdatesJobMap[user] =
scope.launch(Dispatchers.Default) {
scope.launch(Dispatchers.IO) {
followList.sample(1000).collectLatest {
invalidateFilters(true)
}
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/AccountMetadataEoseManager.kt
+1 -1
View File
@@ -65,7 +65,7 @@ class AccountMetadataEoseManager(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
relayFlow(key).collectLatest {
invalidateFilters()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromInboxRelaysManager.kt
+2 -2
View File
@@ -71,12 +71,12 @@ class AccountNotificationsEoseFromInboxRelaysManager(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.account.notificationRelays.flow.sample(1000).collectLatest {
invalidateFilters()
}
},
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.feedContentStates.notifications.lastNoteCreatedAtWhenFullyLoaded.sample(5000).collectLatest {
invalidateFilters()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromRandomRelaysManager.kt
+2 -2
View File
@@ -67,13 +67,13 @@ class AccountNotificationsEoseFromRandomRelaysManager(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
// no need to hurry here. we can wait the app stabilize
key.account.followsPerRelay.debounce(5000).collectLatest {
invalidateFilters()
}
},
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.feedContentStates.notifications.lastNoteCreatedAtWhenFullyLoaded.sample(5000).collectLatest {
invalidateFilters()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip59GiftWraps/AccountGiftWrapsEoseManager.kt
+1 -1
View File
@@ -65,7 +65,7 @@ class AccountGiftWrapsEoseManager(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.account.dmRelays.flow.collectLatest {
invalidateFilters()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/ChannelObservers.kt
+1 -1
View File
@@ -76,7 +76,7 @@ fun observeChannelNoteAuthors(
channelToParticipatingUsers(baseChannel, accountViewModel),
)
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(persistentListOf())
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/EventObservers.kt
+5 -5
View File
@@ -97,7 +97,7 @@ fun <T> observeNoteAndMap(
.metadata.stateFlow
.mapLatest { map(it.note) }
.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
// Subscribe in the LocalCache for changes that arrive in the device
@@ -123,7 +123,7 @@ fun <T, U> observeNoteEventAndMap(
.metadata.stateFlow
.mapLatest { (it.note.event as? T)?.let { map(it) } }
.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
// Subscribe in the LocalCache for changes that arrive in the device
@@ -223,7 +223,7 @@ fun observeNoteReactionCount(
.sample(200)
.mapLatest { it.note.countReactions() }
.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
// Subscribe in the LocalCache for changes that arrive in the device
@@ -278,7 +278,7 @@ fun observeNoteRepostsBy(
.boosts.stateFlow
.mapLatest { it.note.isBoostedBy(user) }
.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(note.isBoostedBy(user))
@@ -401,7 +401,7 @@ fun observeCommunityApprovalNeedStatus(
}
}
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
// Subscribe in the LocalCache for changes that arrive in the device
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt
+13 -13
View File
@@ -253,7 +253,7 @@ fun observeUserFollowCount(
.mapLatest { userState ->
userState.user.transientFollowCount() ?: 0
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(0)
@@ -281,7 +281,7 @@ fun observeUserTagFollowCount(
}.onStart {
emit((accountViewModel.hashtagFollows(user).event as? HashtagListEvent)?.let { accountViewModel.account.hashtagListDecryptionCache.hashtags(it) }?.size ?: 0)
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(0)
@@ -309,7 +309,7 @@ fun observeUserTagFollows(
}.onStart {
emit((accountViewModel.hashtagFollows(user).event as? HashtagListEvent)?.let { accountViewModel.account.hashtagListDecryptionCache.hashtags(it) }?.sorted() ?: emptyList())
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(emptyList())
@@ -356,7 +356,7 @@ fun observeUserBookmarkCount(
.mapLatest { noteState ->
(noteState.note.event as? BookmarkListEvent)?.countBookmarks() ?: 0
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(0)
@@ -396,7 +396,7 @@ fun observeUserFollowerCount(
.mapLatest { userState ->
userState.user.transientFollowerCount()
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(0)
@@ -426,7 +426,7 @@ fun observeUserIsFollowing(
.mapLatest { userState ->
userState.user.isFollowing(user2) || isUserInFollowSets
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(
@@ -450,7 +450,7 @@ fun observeUserIsFollowingHashtag(
}.onStart {
emit(hashtag in accountViewModel.account.hashtagList.flow.value)
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(hashtag in accountViewModel.account.hashtagList.flow.value)
@@ -471,7 +471,7 @@ fun observeUserIsFollowingGeohash(
}.onStart {
emit(geohash in accountViewModel.account.geohashList.flow.value)
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(geohash in accountViewModel.account.geohashList.flow.value)
@@ -496,7 +496,7 @@ fun observeUserIsFollowingChannel(
.mapLatest { followingChannels ->
channel.idHex in followingChannels
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
@SuppressLint("StateFlowValueCalledInComposition")
@@ -522,7 +522,7 @@ fun observeUserIsFollowingChannel(
.mapLatest { followingChannels ->
channel.roomId in followingChannels
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
@SuppressLint("StateFlowValueCalledInComposition")
@@ -563,7 +563,7 @@ fun observeUserZapAmount(
.mapLatest { userState ->
userState.user.zappedAmount()
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(BigDecimal.ZERO)
@@ -630,7 +630,7 @@ fun observeUserStatuses(
.mapLatest { userState ->
LocalCache.findStatusesForUser(userState.user)
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(persistentListOf())
@@ -649,7 +649,7 @@ fun observeUserRelayIntoList(
.mapLatest { relays ->
relayUrl in relays
}.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
}
return flow.collectAsStateWithLifecycle(false)
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
+1 -1
View File
@@ -110,7 +110,7 @@ class MainActivity : AppCompatActivity() {
// Graph doesn't completely clear.
// @OptIn(DelicateCoroutinesApi::class)
// GlobalScope.launch(Dispatchers.Default) {
// GlobalScope.launch(Dispatchers.IO) {
// serviceManager.trimMemory()
// }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
+1 -1
View File
@@ -85,7 +85,7 @@ fun CashuPreview(
initialValue = CachedCashuParser.cached(cashutoken),
key1 = cashutoken,
) {
val newToken = withContext(Dispatchers.Default) { CachedCashuParser.parse(cashutoken) }
val newToken = withContext(Dispatchers.IO) { CachedCashuParser.parse(cashutoken) }
if (value != newToken) {
value = newToken
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+1 -1
View File
@@ -583,7 +583,7 @@ fun DisplaySecretEmoji(
if (secretContent == null) {
LaunchedEffect(segment) {
launch(Dispatchers.Default) {
launch(Dispatchers.IO) {
secretContent =
CachedRichTextParser.parseText(
EmojiCoder.decode(segment.segmentText),
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentDialog.kt
+1 -1
View File
@@ -150,7 +150,7 @@ private fun DialogContent(
pagerState.scrollToPage(page)
}
}
launch(Dispatchers.Default) {
launch(Dispatchers.IO) {
delay(2000)
withContext(Dispatchers.Main) {
controllerVisible.value = false
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/ChannelFeedContentState.kt
+3 -3
View File
@@ -68,7 +68,7 @@ class ChannelFeedContentState(
}
private fun refresh() {
viewModelScope.launch(Dispatchers.Default) { refreshSuspended() }
viewModelScope.launch(Dispatchers.IO) { refreshSuspended() }
}
fun refreshSuspended() {
@@ -135,8 +135,8 @@ class ChannelFeedContentState(
}
}
private val bundler = BundledUpdate(250, Dispatchers.Default)
private val bundlerInsert = BundledInsert<Set<Note>>(250, Dispatchers.Default)
private val bundler = BundledUpdate(250, Dispatchers.IO)
private val bundlerInsert = BundledInsert<Set<Note>>(250, Dispatchers.IO)
override fun invalidateData(ignoreIfDoing: Boolean) {
viewModelScope.launch(Dispatchers.IO) {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/FeedContentState.kt
+1 -1
View File
@@ -71,7 +71,7 @@ class FeedContentState(
}
private fun refresh() {
viewModelScope.launch(Dispatchers.Default) { refreshSuspended() }
viewModelScope.launch(Dispatchers.IO) { refreshSuspended() }
}
fun visibleNotes(): List<Note> {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt
+1 -1
View File
@@ -134,7 +134,7 @@ fun LoadOts(
LaunchedEffect(key1 = noteStatus) {
val newOts =
withContext(Dispatchers.Default) {
withContext(Dispatchers.IO) {
LocalCache.findEarliestOtsForNote(
note = noteStatus?.note ?: note,
otsVerifCache = Amethyst.instance.otsVerifCache,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt
+1 -1
View File
@@ -260,7 +260,7 @@ fun DisplaySecretEmojiAsReaction(
if (secretContent == null) {
LaunchedEffect(reaction) {
launch(Dispatchers.Default) {
launch(Dispatchers.IO) {
secretContent =
CachedRichTextParser.parseText(
EmojiCoder.decode(reaction),
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt
+1 -1
View File
@@ -100,7 +100,7 @@ class PollNoteViewModel : ViewModel() {
}
fun refreshTallies() {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
totalZapped = totalZapped()
wasZappedByLoggedInAccount = false
wasZappedByLoggedInAccount = account.calculateIfNoteWasZappedByAccount(pollNote, 0)
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/emojiSuggestions/EmojiSuggestionState.kt
+1 -1
View File
@@ -44,7 +44,7 @@ class EmojiSuggestionState(
} else {
emptyList()
}
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
fun reset() {
if (search.value.isNotEmpty()) {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/invoice/InvoicePreview.kt
+1 -1
View File
@@ -72,7 +72,7 @@ fun LoadValueFromInvoice(
@Suppress("ProduceStateDoesNotAssignValue")
val lnInvoice by
produceState(initialValue = CachedLnInvoiceParser.cached(lnbcWord), key1 = lnbcWord) {
val newLnInvoice = withContext(Dispatchers.Default) { CachedLnInvoiceParser.parse(lnbcWord) }
val newLnInvoice = withContext(Dispatchers.IO) { CachedLnInvoiceParser.parse(lnbcWord) }
if (value != newLnInvoice) {
value = newLnInvoice
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/previews/PreviewState.kt
+1 -1
View File
@@ -39,7 +39,7 @@ class PreviewState {
.debounce(500)
.map { CachedUrlParser.parseValidUrls(it.text) }
.distinctUntilChanged()
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
fun reset() {
source.tryEmit(TextFieldValue(""))
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/userSuggestions/ShowUserSuggestionList.kt
+2 -2
View File
@@ -64,12 +64,12 @@ fun ShowUserSuggestionList(
AnimateOnNewSearch(userSuggestions, listState)
LaunchedEffect(Unit) {
launch(Dispatchers.Default) {
launch(Dispatchers.IO) {
LocalCache.live.newEventBundles.collect {
userSuggestions.invalidateData()
}
}
launch(Dispatchers.Default) {
launch(Dispatchers.IO) {
LocalCache.live.deletedEventBundles.collect {
userSuggestions.invalidateData()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/userSuggestions/UserSuggestionState.kt
+1 -1
View File
@@ -62,7 +62,7 @@ class UserSuggestionState(
} else {
emptyList()
}
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
fun reset() {
currentWord.tryEmit("")
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/CommentPostViewModel.kt
+3 -3
View File
@@ -323,7 +323,7 @@ open class CommentPostViewModel :
cancel()
accountViewModel.account.signAndComputeBroadcast(template, extraNotesToBroadcast)
accountViewModel.viewModelScope.launch(Dispatchers.Default) {
accountViewModel.viewModelScope.launch(Dispatchers.IO) {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
}
@@ -465,7 +465,7 @@ open class CommentPostViewModel :
onError: (title: String, message: String) -> Unit,
context: Context,
) {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val myMultiOrchestrator = multiOrchestrator ?: return@launch
isUploadingImage = true
@@ -673,7 +673,7 @@ open class CommentPostViewModel :
}
override fun updateZapFromText() {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val tagger =
NewMessageTagger(message.text, emptyList(), emptyList(), accountViewModel)
tagger.run()
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt
+1 -1
View File
@@ -88,7 +88,7 @@ fun RenderAppDefinition(
var metadata by remember { mutableStateOf<AppMetadata?>(null) }
LaunchedEffect(key1 = noteEvent) {
withContext(Dispatchers.Default) { metadata = noteEvent.appMetaData() }
withContext(Dispatchers.IO) { metadata = noteEvent.appMetaData() }
}
metadata?.let { theAppMetadata ->
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/MedicalData.kt
+1 -1
View File
@@ -185,7 +185,7 @@ fun RenderFhirResource(
fun RenderFhirResource(event: FhirResourceEvent) {
@Suppress("ProduceStateDoesNotAssignValue")
val state by produceState(initialValue = FhirElementDatabase(), key1 = event) {
withContext(Dispatchers.Default) {
withContext(Dispatchers.IO) {
parseResourceBundleOrNull(event.content)?.let {
value = it
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
+2 -2
View File
@@ -49,14 +49,14 @@ abstract class FeedViewModel(
init {
Log.d("Init", "Starting new Model: ${this.javaClass.simpleName}")
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
LocalCache.live.newEventBundles.collect { newNotes ->
Log.d("Rendering Metrics", "Update feeds: ${this@FeedViewModel.javaClass.simpleName} with ${newNotes.size}")
feedState.updateFeedWith(newNotes)
}
}
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
LocalCache.live.deletedEventBundles.collect { newNotes ->
Log.d("Rendering Metrics", "Delete from feeds: ${this@FeedViewModel.javaClass.simpleName} with ${newNotes.size}")
feedState.deleteFromFeed(newNotes)
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FollowListState.kt
+2 -2
View File
@@ -253,11 +253,11 @@ class FollowListState(
val kind3GlobalPeopleRoutes =
_kind3GlobalPeopleRoutes
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(viewModelScope, SharingStarted.Eagerly, defaultLists)
val kind3GlobalPeople =
_kind3GlobalPeople
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(viewModelScope, SharingStarted.Eagerly, defaultLists)
suspend fun initializeSuspend() {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
+3 -3
View File
@@ -49,7 +49,7 @@ open class UserFeedViewModel(
val feedContent = _feedContent.asStateFlow()
private fun refresh() {
viewModelScope.launch(Dispatchers.Default) { refreshSuspended() }
viewModelScope.launch(Dispatchers.IO) { refreshSuspended() }
}
override val isRefreshing: MutableState<Boolean> = mutableStateOf(false)
@@ -100,14 +100,14 @@ open class UserFeedViewModel(
init {
Log.d("Init", "${this.javaClass.simpleName}")
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
LocalCache.live.newEventBundles.collect { newNotes ->
Log.d("Rendering Metrics", "Update feeds: ${this@UserFeedViewModel.javaClass.simpleName} with ${newNotes.size}")
invalidateData()
}
}
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
LocalCache.live.deletedEventBundles.collect { newNotes ->
Log.d("Rendering Metrics", "Delete from feeds: ${this@UserFeedViewModel.javaClass.simpleName} with ${newNotes.size}")
invalidateData()
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
+15 -15
View File
@@ -202,7 +202,7 @@ class AccountViewModel(
val notificationHasNewItemsFlow =
notificationHasNewItems
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(30000), false)
@OptIn(ExperimentalCoroutinesApi::class)
@@ -251,7 +251,7 @@ class AccountViewModel(
val messagesHasNewItemsFlow =
messagesHasNewItems
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(30000), false)
@OptIn(ExperimentalCoroutinesApi::class)
@@ -284,7 +284,7 @@ class AccountViewModel(
val homeHasNewItemsFlow =
homeHasNewItems
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(30000), false)
val hasNewItems =
@@ -394,7 +394,7 @@ class AccountViewModel(
account.kind3FollowList.flow.value.authors,
),
)
}.flowOn(Dispatchers.Default)
}.flowOn(Dispatchers.IO)
.stateIn(
viewModelScope,
SharingStarted.WhileSubscribed(10000, 10000),
@@ -412,7 +412,7 @@ class AccountViewModel(
.relays
.stateFlow
.map { it.note.relays.size > 3 }
.flowOn(Dispatchers.Default)
.flowOn(Dispatchers.IO)
.stateIn(
viewModelScope,
SharingStarted.WhileSubscribed(10000, 10000),
@@ -431,7 +431,7 @@ class AccountViewModel(
suspend fun calculateZapAmount(zappedNote: Note): String =
if (zappedNote.zapPayments.isNotEmpty()) {
withContext(Dispatchers.Default) {
withContext(Dispatchers.IO) {
val it = account.calculateZappedAmount(zappedNote)
showAmount(it)
}
@@ -442,7 +442,7 @@ class AccountViewModel(
suspend fun calculateZapraiser(zappedNote: Note): ZapraiserStatus {
val zapraiserAmount = zappedNote.event?.zapraiserAmount() ?: 0
return if (zappedNote.zapPayments.isNotEmpty()) {
withContext(Dispatchers.Default) {
withContext(Dispatchers.IO) {
val newZapAmount = account.calculateZappedAmount(zappedNote)
var percentage = newZapAmount.div(zapraiserAmount.toBigDecimal()).toFloat()
@@ -1027,7 +1027,7 @@ class AccountViewModel(
fun cachedModificationEventsForNote(note: Note) = LocalCache.cachedModificationEventsForNote(note)
suspend fun findModificationEventsForNote(note: Note): List<Note> =
withContext(Dispatchers.Default) {
withContext(Dispatchers.IO) {
LocalCache.findLatestModificationForNote(note)
}
@@ -1067,7 +1067,7 @@ class AccountViewModel(
hexList: List<String>,
onReady: (ImmutableList<User>) -> Unit,
) {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
onReady(loadUsersSync(hexList).toImmutableList())
}
}
@@ -1094,7 +1094,7 @@ class AccountViewModel(
val onIsNew = createdAt > lastTime
if (onIsNew) {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
account.markAsRead(routeForLastRead, createdAt)
}
}
@@ -1142,7 +1142,7 @@ class AccountViewModel(
init {
Log.d("Init", "AccountViewModel")
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
feedStates.init()
// awaits for init to finish before starting to capture new events.
LocalCache.live.newEventBundles.collect { newNotes ->
@@ -1152,7 +1152,7 @@ class AccountViewModel(
}
}
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
LocalCache.live.deletedEventBundles.collect { newNotes ->
logTime("AccountViewModel deletedEventBundle Update with ${newNotes.size} new notes") {
feedStates.deleteNotes(newNotes)
@@ -1602,7 +1602,7 @@ class AccountViewModel(
val accountViewModel: AccountViewModel,
) : GenericBaseCache<String, LoadedBechLink>(20) {
override suspend fun compute(key: String): LoadedBechLink? =
withContext(Dispatchers.Default) {
withContext(Dispatchers.IO) {
Nip19Parser.uriToRoute(key)?.let {
var returningNote: Note? = null
@@ -1621,10 +1621,10 @@ class AccountViewModel(
}
}
is NEmbed ->
withContext(Dispatchers.Default) {
withContext(Dispatchers.IO) {
val baseNote = LocalCache.getOrCreateNote(parsed.event)
if (baseNote.event == null) {
launch(Dispatchers.Default) {
launch(Dispatchers.IO) {
LocalCache.justConsume(parsed.event, null, false)
}
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/dal/ChatroomFeedViewModel.kt
+1 -1
View File
@@ -61,7 +61,7 @@ abstract class ListChangeFeedViewModel(
init {
Log.d("Init", "Starting new Model: ${this.javaClass.simpleName}")
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
localFilter.changesFlow().collect {
Log.d("Init", "Collecting changes to: ${this@ListChangeFeedViewModel.javaClass.simpleName}")
when (it) {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt
+3 -3
View File
@@ -361,7 +361,7 @@ class ChatNewMessageViewModel :
val version = draftTag.current
innerSendPost(null)
cancel()
accountViewModel.viewModelScope.launch(Dispatchers.Default) {
accountViewModel.viewModelScope.launch(Dispatchers.IO) {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
}
@@ -594,7 +594,7 @@ class ChatNewMessageViewModel :
}
fun updateRoomFromUsersInput() {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
delay(300)
val toUsersTagger = NewMessageTagger(toUsers.text, null, null, accountViewModel)
toUsersTagger.run()
@@ -717,7 +717,7 @@ class ChatNewMessageViewModel :
}
override fun updateZapFromText() {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val tagger = NewMessageTagger(message.text, emptyList(), emptyList(), accountViewModel)
tagger.run()
tagger.pTags?.forEach { taggedUser ->
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/send/ChannelNewMessageViewModel.kt
+3 -3
View File
@@ -277,7 +277,7 @@ open class ChannelNewMessageViewModel :
cancel()
accountViewModel.account.signAndSendPrivately(template, channelRelays)
accountViewModel.viewModelScope.launch(Dispatchers.Default) {
accountViewModel.viewModelScope.launch(Dispatchers.IO) {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
}
@@ -319,7 +319,7 @@ open class ChannelNewMessageViewModel :
context: Context,
onceUploaded: suspend () -> Unit,
) {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val uploadState = uploadState ?: return@launch
val myMultiOrchestrator = uploadState.multiOrchestrator ?: return@launch
@@ -630,7 +630,7 @@ open class ChannelNewMessageViewModel :
}
fun updateZapFromText() {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val tagger = NewMessageTagger(message.text, emptyList(), emptyList(), accountViewModel)
tagger.run()
tagger.pTags?.forEach { taggedUser ->
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/DMsFromUserFilterSubAssembler.kt
+2 -2
View File
@@ -61,12 +61,12 @@ class DMsFromUserFilterSubAssembler(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.account.homeRelays.flow.collectLatest {
invalidateFilters()
}
},
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.account.dmRelays.flow.collectLatest {
invalidateFilters()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FollowingEphemeralChatSubAssembler.kt
+1 -1
View File
@@ -54,7 +54,7 @@ class FollowingEphemeralChatSubAssembler(
userJobMap[key.account.userProfile()]?.forEach { it.cancel() }
userJobMap[key.account.userProfile()] =
listOf(
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.account.ephemeralChatList.liveEphemeralChatList.sample(500).collectLatest {
invalidateFilters()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FollowingPublicChatSubAssembler.kt
+1 -1
View File
@@ -55,7 +55,7 @@ class FollowingPublicChatSubAssembler(
userJobMap[key.account.userProfile()]?.forEach { it.cancel() }
userJobMap[key.account.userProfile()] =
listOf(
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.account.publicChatList.flowSet.sample(500).collectLatest {
invalidateFilters()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/datasource/DiscoveryFollowsSetsAndLiveStreamsSubAssembler2.kt
+3 -3
View File
@@ -70,17 +70,17 @@ class DiscoveryFollowsSetsAndLiveStreamsSubAssembler2(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.scope.launch(Dispatchers.Default) {
key.scope.launch(Dispatchers.IO) {
key.listNameFlow().collectLatest {
invalidateFilters()
}
},
key.scope.launch(Dispatchers.Default) {
key.scope.launch(Dispatchers.IO) {
key.followsPerRelayFlow().sample(1000).collectLatest {
invalidateFilters()
}
},
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
combine(
key.feedStates.discoverFollowSets.lastNoteCreatedAtWhenFullyLoaded,
key.feedStates.discoverLive.lastNoteCreatedAtWhenFullyLoaded,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/datasource/DiscoveryLongFormClassifiedsAndDVMSubAssembler1.kt
+3 -3
View File
@@ -72,17 +72,17 @@ class DiscoveryLongFormClassifiedsAndDVMSubAssembler1(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.scope.launch(Dispatchers.Default) {
key.scope.launch(Dispatchers.IO) {
key.listNameFlow().collectLatest {
invalidateFilters()
}
},
key.scope.launch(Dispatchers.Default) {
key.scope.launch(Dispatchers.IO) {
key.followsPerRelayFlow().sample(500).collectLatest {
invalidateFilters()
}
},
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
combine(
key.feedStates.discoverReads.lastNoteCreatedAtWhenFullyLoaded,
key.feedStates.discoverDVMs.lastNoteCreatedAtWhenFullyLoaded,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/datasource/DiscoveryPublicChatsAndCommunitiesSubAssembler3.kt
+3 -3
View File
@@ -69,17 +69,17 @@ class DiscoveryPublicChatsAndCommunitiesSubAssembler3(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.scope.launch(Dispatchers.Default) {
key.scope.launch(Dispatchers.IO) {
key.listNameFlow().collectLatest {
invalidateFilters()
}
},
key.scope.launch(Dispatchers.Default) {
key.scope.launch(Dispatchers.IO) {
key.followsPerRelayFlow().sample(500).collectLatest {
invalidateFilters()
}
},
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
combine(
key.feedStates.discoverPublicChats.lastNoteCreatedAtWhenFullyLoaded,
key.feedStates.discoverCommunities.lastNoteCreatedAtWhenFullyLoaded,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductViewModel.kt
+3 -3
View File
@@ -297,7 +297,7 @@ open class NewProductViewModel :
cancel()
accountViewModel.account.signAndSendPrivatelyOrBroadcast(template, relayList = { relayList })
accountViewModel.viewModelScope.launch(Dispatchers.Default) {
accountViewModel.viewModelScope.launch(Dispatchers.IO) {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
}
@@ -379,7 +379,7 @@ open class NewProductViewModel :
onError: (title: String, message: String) -> Unit,
context: Context,
) {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val myAccount = account ?: return@launch
val myMultiOrchestrator = multiOrchestrator ?: return@launch
@@ -593,7 +593,7 @@ open class NewProductViewModel :
}
override fun updateZapFromText() {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val tagger = NewMessageTagger(message.text, emptyList(), emptyList(), accountViewModel!!)
tagger.run()
tagger.pTags?.forEach { taggedUser ->
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt
+3 -3
View File
@@ -483,7 +483,7 @@ open class ShortNotePostViewModel :
cancel()
accountViewModel.account.signAndComputeBroadcast(template, extraNotesToBroadcast)
accountViewModel.viewModelScope.launch(Dispatchers.Default) {
accountViewModel.viewModelScope.launch(Dispatchers.IO) {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
}
@@ -643,7 +643,7 @@ open class ShortNotePostViewModel :
context: Context,
useH265: Boolean,
) {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val myMultiOrchestrator = multiOrchestrator ?: return@launch
isUploadingImage = true
@@ -899,7 +899,7 @@ open class ShortNotePostViewModel :
}
override fun updateZapFromText() {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val tagger =
NewMessageTagger(message.text, emptyList(), emptyList(), accountViewModel)
tagger.run()
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/HomeOutboxEventsEoseManager.kt
+4 -4
View File
@@ -91,22 +91,22 @@ class HomeOutboxEventsEoseManager(
userJobMap[user]?.forEach { it.cancel() }
userJobMap[user] =
listOf(
key.scope.launch(Dispatchers.Default) {
key.scope.launch(Dispatchers.IO) {
key.listNameFlow().collectLatest {
invalidateFilters()
}
},
key.scope.launch(Dispatchers.Default) {
key.scope.launch(Dispatchers.IO) {
key.followRelayFlow().sample(1000).collectLatest {
invalidateFilters()
}
},
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.feedState.homeNewThreads.lastNoteCreatedAtWhenFullyLoaded.sample(5000).collectLatest {
invalidateFilters()
}
},
key.account.scope.launch(Dispatchers.Default) {
key.account.scope.launch(Dispatchers.IO) {
key.feedState.homeReplies.lastNoteCreatedAtWhenFullyLoaded.sample(5000).collectLatest {
invalidateFilters()
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/CardFeedContentState.kt
+1 -1
View File
@@ -104,7 +104,7 @@ class CardFeedContentState(
fun lastNoteCreatedAtIfFilled() = lastNoteCreatedAtWhenFullyLoaded.value
fun refresh() {
viewModelScope.launch(Dispatchers.Default) { refreshSuspended() }
viewModelScope.launch(Dispatchers.IO) { refreshSuspended() }
}
@Synchronized
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt
+3 -3
View File
@@ -320,7 +320,7 @@ class NewPublicMessageViewModel :
cancel()
accountViewModel.account.signAndComputeBroadcast(template, extraNotesToBroadcast)
accountViewModel.viewModelScope.launch(Dispatchers.Default) {
accountViewModel.viewModelScope.launch(Dispatchers.IO) {
accountViewModel.account.deleteDraftIgnoreErrors(version)
}
}
@@ -413,7 +413,7 @@ class NewPublicMessageViewModel :
onError: (title: String, message: String) -> Unit,
context: Context,
) {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val myMultiOrchestrator = multiOrchestrator ?: return@launch
isUploadingImage = true
@@ -628,7 +628,7 @@ class NewPublicMessageViewModel :
}
override fun updateZapFromText() {
viewModelScope.launch(Dispatchers.Default) {
viewModelScope.launch(Dispatchers.IO) {
val tagger = NewMessageTagger(message.text, emptyList(), emptyList(), accountViewModel)
tagger.run()
tagger.pTags?.forEach { taggedUser ->

Some files were not shown because too many files have changed in this diff Show More