From 19856c7ef579d5c2282237aff31b3bd455cfd7e3 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 14 Apr 2023 18:17:56 +1000 Subject: [PATCH] Disabled the disappearing messages setting when not a group member --- .../ThreadDisappearingMessagesViewModel.swift | 15 ++++++- .../Views/SessionCell+AccessoryView.swift | 30 ++++++++++---- .../SessionThreadViewModel.swift | 41 +++++++++++-------- .../Themes/Theme+ClassicDark.swift | 3 ++ .../Themes/Theme+ClassicLight.swift | 3 ++ .../Style Guide/Themes/Theme+Colors.swift | 4 +- .../Style Guide/Themes/Theme+OceanDark.swift | 3 ++ .../Style Guide/Themes/Theme+OceanLight.swift | 3 ++ SessionUIKit/Style Guide/Themes/Theme.swift | 3 ++ 9 files changed, 76 insertions(+), 29 deletions(-) diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift index 886cc326a..a562ee556 100644 --- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift +++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift @@ -98,7 +98,12 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel [SectionModel] in + .trackingConstantRegion { [weak self, config, dependencies, threadId = self.threadId] db -> [SectionModel] in + let userPublicKey: String = getUserHexEncodedPublicKey(db, dependencies: dependencies) + let maybeThreadViewModel: SessionThreadViewModel? = try SessionThreadViewModel + .conversationSettingsQuery(threadId: threadId, userPublicKey: userPublicKey) + .fetchOne(db) + return [ SectionModel( model: .content, @@ -109,6 +114,10 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel