dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-09-01 22:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed differently

Browse Source
This commit is contained in:
Avently
2024-10-25 19:47:16 +07:00
parent 8e795d708d
commit 8b19c71d2a
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
+1 -3
View File
@@ -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()
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseErrorView.kt
+1 -1
View File
@@ -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 ->