From b66eb5b67fa0cfe7b6eba395d690e0d309a9c6d6 Mon Sep 17 00:00:00 2001 From: JRoberts <8711996+jr-simplex@users.noreply.github.com> Date: Fri, 7 Oct 2022 15:01:17 +0400 Subject: [PATCH] mobile: disable setting chat item TTL if chat db changed (#1183) --- .../java/chat/simplex/app/views/database/DatabaseView.kt | 5 ++++- apps/ios/Shared/Views/Database/DatabaseView.swift | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt index d5c10f8778..ae0882b53d 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt @@ -75,6 +75,7 @@ fun DatabaseView( DatabaseLayout( progressIndicator.value, runChat.value, + m.chatDbChanged.value, useKeychain.value, m.chatDbEncrypted.value, m.controller.appPrefs.initialRandomDBPassphrase, @@ -122,6 +123,7 @@ fun DatabaseView( fun DatabaseLayout( progressIndicator: Boolean, runChat: Boolean, + chatDbChanged: Boolean, useKeyChain: Boolean, chatDbEncrypted: Boolean?, initialRandomDBPassphrase: Preference, @@ -219,7 +221,7 @@ fun DatabaseLayout( SectionSpacer() SectionView(stringResource(R.string.data_section)) { - SectionItemView { TtlOptions(chatItemTTL, rememberUpdatedState(!progressIndicator), onChatItemTTLSelected) } + SectionItemView { TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!progressIndicator && !chatDbChanged), onChatItemTTLSelected) } SectionDivider() val deleteFilesDisabled = operationsDisabled || appFilesCountAndSize.value.first == 0 SectionItemView( @@ -666,6 +668,7 @@ fun PreviewDatabaseLayout() { DatabaseLayout( progressIndicator = false, runChat = true, + chatDbChanged = false, useKeyChain = false, chatDbEncrypted = false, initialRandomDBPassphrase = Preference({ true }, {}), diff --git a/apps/ios/Shared/Views/Database/DatabaseView.swift b/apps/ios/Shared/Views/Database/DatabaseView.swift index ab7ca751f7..c851472ae8 100644 --- a/apps/ios/Shared/Views/Database/DatabaseView.swift +++ b/apps/ios/Shared/Views/Database/DatabaseView.swift @@ -166,6 +166,7 @@ struct DatabaseView: View { } } .frame(height: 36) + .disabled(m.chatDbChanged || progressIndicator) Button("Delete files & media", role: .destructive) { alert = .deleteFilesAndMedia }