Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove main-thread usage of Recipient.self.

Browse Source
This commit is contained in:
Alex Hart
2025-04-23 14:19:36 -03:00
committed by Cody Henthorne
parent 83bbcd0618
commit dac3a332d7
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
View File

@@ -129,7 +129,7 @@ enum class MainToolbarMode {
data class MainToolbarState( data class MainToolbarState(
val toolbarColor: Color? = null, val toolbarColor: Color? = null,
val self: Recipient = Recipient.self(), val self: Recipient = Recipient.UNKNOWN,
val mode: MainToolbarMode = MainToolbarMode.FULL, val mode: MainToolbarMode = MainToolbarMode.FULL,
val destination: MainNavigationListLocation = MainNavigationListLocation.CHATS, val destination: MainNavigationListLocation = MainNavigationListLocation.CHATS,
val chatFilter: ConversationFilter = ConversationFilter.OFF, val chatFilter: ConversationFilter = ConversationFilter.OFF,

13
app/src/main/java/org/thoughtcrime/securesms/main/MainToolbarViewModel.kt
View File

@@ -18,6 +18,8 @@ import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.rx3.asFlowable import kotlinx.coroutines.rx3.asFlowable
import kotlinx.coroutines.withContext
import org.signal.core.util.concurrent.SignalDispatchers
import org.thoughtcrime.securesms.backup.v2.BackupRepository import org.thoughtcrime.securesms.backup.v2.BackupRepository
import org.thoughtcrime.securesms.calls.log.CallLogFilter import org.thoughtcrime.securesms.calls.log.CallLogFilter
import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
@@ -31,9 +33,18 @@ class MainToolbarViewModel : ViewModel() {
val state: StateFlow<MainToolbarState> = internalStateFlow val state: StateFlow<MainToolbarState> = internalStateFlow
fun refresh() { fun refresh() {
viewModelScope.launch {
val self = withContext(SignalDispatchers.IO) {
Recipient.self().resolve()
}
internalStateFlow.update {
it.copy(self = self)
}
}
internalStateFlow.update { internalStateFlow.update {
it.copy( it.copy(
self = Recipient.self(),
hasFailedBackups = BackupRepository.shouldDisplayBackupFailedIndicator() || BackupRepository.shouldDisplayBackupAlreadyRedeemedIndicator(), hasFailedBackups = BackupRepository.shouldDisplayBackupFailedIndicator() || BackupRepository.shouldDisplayBackupAlreadyRedeemedIndicator(),
hasPassphrase = !SignalStore.settings.passphraseDisabled hasPassphrase = !SignalStore.settings.passphraseDisabled
) )