From e6aad24e5fa14f3aea340e77ea1de5ff77af8c2d Mon Sep 17 00:00:00 2001 From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:39:24 +0300 Subject: [PATCH] android: Timed messages TTL logic in preferences (#1624) * android: Timed messages TTL logic in preferences * do not set ttl in global timed message prefs Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> --- .../app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt | 2 +- .../main/java/chat/simplex/app/views/chat/ContactPreferences.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt index 602c869bd..1faab0370 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt @@ -2056,7 +2056,7 @@ data class SimpleChatPreference( ): ChatPreference @Serializable -class TimedMessagesPreference( +data class TimedMessagesPreference( override val allow: FeatureAllowed, val ttl: Int? = null ): ChatPreference { diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt index 773ecc0c1..f48f44551 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt @@ -21,7 +21,6 @@ import chat.simplex.app.model.* import chat.simplex.app.ui.theme.* import chat.simplex.app.views.helpers.* import chat.simplex.app.views.usersettings.PreferenceToggle -import chat.simplex.app.views.usersettings.PreferenceToggleWithIcon @Composable fun ContactPreferencesView(