TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove flowOn in LoadingViewModel

Browse Source
This commit is contained in:
Andrew 2024-06-21 11:45:50 +09:30
parent b7de36b694
commit 27c59a8d7b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/onboarding/loading/LoadingViewModel.kt
View File

@ -49,22 +49,25 @@ internal class LoadingViewModel @Inject constructor(
.onStart { emit(TextSecurePreferences.CONFIGURATION_SYNCED) } .onStart { emit(TextSecurePreferences.CONFIGURATION_SYNCED) }
.filter { prefs.getConfigurationMessageSynced() } .filter { prefs.getConfigurationMessageSynced() }
.timeout(TIMEOUT_TIME) .timeout(TIMEOUT_TIME)
.flowOn(Dispatchers.Main)
.collectLatest { onSuccess() } .collectLatest { onSuccess() }
} catch (e: Exception) { } catch (e: Exception) {
withContext(Dispatchers.Main) { onFail() } onFail()
} }
} }
} }
private suspend fun onSuccess() { private suspend fun onSuccess() {
_states.value = State(ANIMATE_TO_DONE_TIME) withContext(Dispatchers.Main) {
delay(IDLE_DONE_TIME) _states.value = State(ANIMATE_TO_DONE_TIME)
_events.emit(Event.SUCCESS) delay(IDLE_DONE_TIME)
_events.emit(Event.SUCCESS)
}
} }
private suspend fun onFail() { private suspend fun onFail() {
_events.emit(Event.TIMEOUT) withContext(Dispatchers.Main) {
_events.emit(Event.TIMEOUT)
}
} }
} }

2
app/src/main/java/org/thoughtcrime/securesms/ui/color/Colors.kt
View File

@ -40,7 +40,7 @@ interface Colors {
val backgroundBubbleSent: Color get() = primary val backgroundBubbleSent: Color get() = primary
// buttonFill // buttonFill
val buttonFill: Color get() = text val buttonFill: Color
val buttonFillText: Color get() = background val buttonFillText: Color get() = background
// primaryButtonFill // primaryButtonFill