mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-10-23 06:22:43 +00:00
fixed differently
This commit is contained in:
1 parent
8e795d708d
commit
8b19c71d2a
2 files changed
+2
-4
No files matched your search
@@ -158,9 +158,7 @@ fun MainScreen() {
|
||||
showChatDatabaseError -> {
|
||||
// Prevent showing keyboard on Android when: passcode enabled and database password not saved
|
||||
if (!unauthorized.value && chatModel.chatDbStatus.value != null) {
|
||||
CompositionLocalProvider(LocalAppBarHandler provides remember { AppBarHandler() }) {
|
||||
DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
|
||||
}
|
||||
DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
|
||||
}
|
||||
}
|
||||
remember { chatModel.chatDbEncrypted }.value == null || localUserCreated == null -> SplashView()
|
||||
|
||||
+1
-1
@@ -77,7 +77,7 @@ fun DatabaseErrorView(
|
||||
Text(String.format(generalGetString(MR.strings.database_migrations), ms.joinToString(", ")))
|
||||
}
|
||||
|
||||
ColumnWithScrollBar(verticalArrangement = Arrangement.Center) {
|
||||
ColumnWithScrollBarNoAppBar(Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center) {
|
||||
val buttonEnabled = validKey(dbKey.value) && !progressIndicator.value
|
||||
when (val status = chatDbStatus.value) {
|
||||
is DBMigrationResult.ErrorNotADatabase ->
|
||||
|
||||
Reference in new issue
Block a user