From 5bf16da09dc96c47286c8b5e520d24983c4a23e9 Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Wed, 19 Apr 2023 15:21:28 +0400
Subject: [PATCH] core, mobile: prohibit to change chat item expiration when
 chat is stopped (#2210)

---
 .../main/java/chat/simplex/app/views/database/DatabaseView.kt   | 2 +-
 apps/ios/Shared/Views/Database/DatabaseView.swift               | 2 +-
 src/Simplex/Chat.hs                                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 869a52cd23..0be861245c 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
@@ -160,7 +160,7 @@ fun DatabaseLayout(
     AppBarTitle(stringResource(R.string.your_chat_database))
 
     SectionView(stringResource(R.string.messages_section_title).uppercase()) {
-      SectionItemView { TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!progressIndicator && !chatDbChanged), onChatItemTTLSelected) }
+      SectionItemView { TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!stopped && !progressIndicator), onChatItemTTLSelected) }
     }
     SectionTextFooter(
       remember(currentUser?.displayName) {
diff --git a/apps/ios/Shared/Views/Database/DatabaseView.swift b/apps/ios/Shared/Views/Database/DatabaseView.swift
index d950c48dfc..cf926e61a7 100644
--- a/apps/ios/Shared/Views/Database/DatabaseView.swift
+++ b/apps/ios/Shared/Views/Database/DatabaseView.swift
@@ -77,7 +77,7 @@ struct DatabaseView: View {
                     }
                 }
                 .frame(height: 36)
-                .disabled(m.chatDbChanged || progressIndicator)
+                .disabled(stopped || progressIndicator)
             } header: {
                 Text("Messages")
             } footer: {
diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index 0efe7924c0..cc1a289397 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -939,7 +939,7 @@ processChatCommand = \case
       CRServerTestResult user srv <$> withAgent (\a -> testProtocolServer a (aUserId user) server)
   TestProtoServer srv -> withUser $ \User {userId} ->
     processChatCommand $ APITestProtoServer userId srv
-  APISetChatItemTTL userId newTTL_ -> withUser' $ \user -> do
+  APISetChatItemTTL userId newTTL_ -> withUser $ \user -> do
     checkSameUser userId user
     checkStoreNotChanged $
       withChatLock "setChatItemTTL" $ do