Updated Conversation Settings - 1

Session.xcodeproj/project.pbxproj

@@ -179,6 +179,8 @@
 		945D9C582D6FDBE7003C4C0C /* _005_AddJobUniqueHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945D9C572D6FDBE7003C4C0C /* _005_AddJobUniqueHash.swift */; };
 		946F5A732D5DA3AC00A5ADCE /* Punycode in Frameworks */ = {isa = PBXBuildFile; productRef = 946F5A722D5DA3AC00A5ADCE /* Punycode */; };
 		9473386E2BDF5F3E00B9E169 /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 9473386D2BDF5F3E00B9E169 /* InfoPlist.xcstrings */; };
+		9479981C2DD44ADC008F5CD5 /* ThreadNotificationSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9479981B2DD44AC5008F5CD5 /* ThreadNotificationSettingsViewModel.swift */; };
+		9499E6032DDD9BF900091434 /* ExpandableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9499E6022DDD9BEE00091434 /* ExpandableLabel.swift */; };
 		947D7FD42D509FC900E8E413 /* SessionNetworkAPI+Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947D7FD12D509FC900E8E413 /* SessionNetworkAPI+Models.swift */; };
 		947D7FD62D509FC900E8E413 /* SessionNetworkAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947D7FCF2D509FC900E8E413 /* SessionNetworkAPI.swift */; };
 		947D7FD72D509FC900E8E413 /* SessionNetworkAPI+Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947D7FD22D509FC900E8E413 /* SessionNetworkAPI+Network.swift */; };
@@ -1479,7 +1481,9 @@
 		945D9C572D6FDBE7003C4C0C /* _005_AddJobUniqueHash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _005_AddJobUniqueHash.swift; sourceTree = "<group>"; };
 		9471CAA72CACFB4E00090FB7 /* GenerateLicenses.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerateLicenses.swift; sourceTree = "<group>"; };
 		9473386D2BDF5F3E00B9E169 /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
+		9479981B2DD44AC5008F5CD5 /* ThreadNotificationSettingsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadNotificationSettingsViewModel.swift; sourceTree = "<group>"; };
 		947AD68F2C8968FF000B2730 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
+		9499E6022DDD9BEE00091434 /* ExpandableLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpandableLabel.swift; sourceTree = "<group>"; };
 		947D7FCF2D509FC900E8E413 /* SessionNetworkAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionNetworkAPI.swift; sourceTree = "<group>"; };
 		947D7FD02D509FC900E8E413 /* SessionNetworkAPI+Database.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionNetworkAPI+Database.swift"; sourceTree = "<group>"; };
 		947D7FD12D509FC900E8E413 /* SessionNetworkAPI+Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionNetworkAPI+Models.swift"; sourceTree = "<group>"; };
@@ -3020,6 +3024,7 @@
 			children = (
 				B84A89BB25DE328A0040017D /* ProfilePictureVC.swift */,
 				FD7115EA28C5D78E00B47552 /* ThreadSettingsViewModel.swift */,
+				9479981B2DD44AC5008F5CD5 /* ThreadNotificationSettingsViewModel.swift */,
 				FD7115F328C71EB200B47552 /* ThreadDisappearingMessagesSettingsViewModel.swift */,
 			);
 			path = Settings;
@@ -3181,6 +3186,7 @@
 				C38EF2A3255B6D93007E1867 /* PlaceholderIcon.swift */,
 				C38EF2A4255B6D93007E1867 /* ProfilePictureView.swift */,
 				FD6673FC2D77F54400041530 /* ScreenLockViewController.swift */,
+				9499E6022DDD9BEE00091434 /* ExpandableLabel.swift */,
 				FD0150572CA27DEE005B08A1 /* ScrollableLabel.swift */,
 				7B8914762A7CAAE200A4C627 /* SessionHostingViewController.swift */,
 				FDA335F42D911576007E0EB6 /* SessionImageView.swift */,
@@ -5861,6 +5867,7 @@
 				9422EE2B2B8C3A97004C740D /* String+Utilities.swift in Sources */,
 				FD37EA0128A60473003AE748 /* UIKit+Theme.swift in Sources */,
 				FD37E9CF28A1EB1B003AE748 /* Theme.swift in Sources */,
+				9499E6032DDD9BF900091434 /* ExpandableLabel.swift in Sources */,
 				FDE754BA2C9B97B8002A2623 /* UIDevice+Utilities.swift in Sources */,
 				C331FFB92558FA8D00070591 /* UIView+Constraints.swift in Sources */,
 				FD0B77B029B69A65009169BA /* TopBannerController.swift in Sources */,
@@ -6576,6 +6583,7 @@
 				4CA46F4C219CCC630038ABDE /* CaptionView.swift in Sources */,
 				C328253025CA55370062D0A7 /* ContextMenuWindow.swift in Sources */,
 				FDEF57242C3CF04700131302 /* (null) in Sources */,
+				9479981C2DD44ADC008F5CD5 /* ThreadNotificationSettingsViewModel.swift in Sources */,
 				34BECE2E1F7ABCE000D7438D /* GifPickerViewController.swift in Sources */,
 				9422568C2C23F8C800C0FDBF /* DisplayNameScreen.swift in Sources */,
 				B84664F5235022F30083A1CD /* MentionUtilities.swift in Sources */,

Session/Conversations/ConversationVC+Interaction.swift

@@ -2113,11 +2113,11 @@ extension ConversationVC:
                     explanation: NSAttributedString(string: deletionBehaviours.body),
                     warning: deletionBehaviours.warning.map { NSAttributedString(string: $0) },
                     options: deletionBehaviours.actions.map { action in
-                        (
-                            action.title,
-                            action.state != .disabled,
-                            action.state == .enabledAndDefaultSelected,
-                            action.accessibility
+                        ConfirmationModal.Info.Body.RadioOptionInfo(
+                            title: action.title,
+                            enabled: action.state != .disabled,
+                            selected: action.state == .enabledAndDefaultSelected,
+                            accessibility: action.accessibility
                         )
                     }
                 ),

Session/Conversations/ConversationVC.swift

@@ -786,7 +786,9 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
             viewModel.threadData.threadIsBlocked != updatedThreadData.threadIsBlocked ||
             viewModel.threadData.threadIsMessageRequest != updatedThreadData.threadIsMessageRequest ||
             viewModel.threadData.threadRequiresApproval != updatedThreadData.threadRequiresApproval ||
-            viewModel.threadData.profile != updatedThreadData.profile
+            viewModel.threadData.profile != updatedThreadData.profile ||
+            viewModel.threadData.additionalProfile != updatedThreadData.additionalProfile ||
+            viewModel.threadData.displayPictureFilename != updatedThreadData.displayPictureFilename
         {
             updateNavBarButtons(
                 threadData: updatedThreadData,
@@ -1371,51 +1373,41 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
                 return
             }
 
-            switch threadData.threadVariant {
-                case .contact:
-                    let profilePictureView = ProfilePictureView(
-                        size: .navigation,
-                        dataManager: viewModel.dependencies[singleton: .imageDataManager]
-                    )
-                    profilePictureView.update(
-                        publicKey: threadData.threadId,  // Contact thread uses the contactId
-                        threadVariant: threadData.threadVariant,
-                        displayPictureFilename: nil,
-                        profile: threadData.profile,
-                        additionalProfile: nil,
-                        using: viewModel.dependencies
-                    )
-                    profilePictureView.customWidth = (44 - 16)   // Width of the standard back button
+            let profilePictureView = ProfilePictureView(
+                size: .navigation,
+                dataManager: viewModel.dependencies[singleton: .imageDataManager]
+            )
+            profilePictureView.update(
+                publicKey: threadData.threadId,  // Contact thread uses the contactId
+                threadVariant: threadData.threadVariant,
+                displayPictureFilename: threadData.displayPictureFilename,
+                profile: threadData.profile,
+                additionalProfile: threadData.additionalProfile,
+                using: viewModel.dependencies
+            )
+            profilePictureView.customWidth = (44 - 16)   // Width of the standard back button
 
-                    let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openSettings))
-                    profilePictureView.addGestureRecognizer(tapGestureRecognizer)
+            let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openSettings))
+            profilePictureView.addGestureRecognizer(tapGestureRecognizer)
 
-                    let settingsButtonItem: UIBarButtonItem = UIBarButtonItem(customView: profilePictureView)
-                    settingsButtonItem.accessibilityLabel = "More options"
-                    settingsButtonItem.isAccessibilityElement = true
-
-                    if shouldHaveCallButton {
-                        let callButton = UIBarButtonItem(
-                            image: UIImage(named: "Phone"),
-                            style: .plain,
-                            target: self,
-                            action: #selector(startCall)
-                        )
-                        callButton.accessibilityLabel = "Call"
-                        callButton.isAccessibilityElement = true
-
-                        navigationItem.rightBarButtonItems = [settingsButtonItem, callButton]
-                    }
-                    else {
-                        navigationItem.rightBarButtonItems = [settingsButtonItem]
-                    }
-
-                default:
-                    let rightBarButtonItem: UIBarButtonItem = UIBarButtonItem(image: UIImage(named: "Gear"), style: .plain, target: self, action: #selector(openSettings))
-                    rightBarButtonItem.accessibilityLabel = "More options"
-                    rightBarButtonItem.isAccessibilityElement = true
-
-                    navigationItem.rightBarButtonItems = [rightBarButtonItem]
+            let settingsButtonItem: UIBarButtonItem = UIBarButtonItem(customView: profilePictureView)
+            settingsButtonItem.accessibilityLabel = "More options"
+            settingsButtonItem.isAccessibilityElement = true
+
+            if shouldHaveCallButton {
+                let callButton = UIBarButtonItem(
+                    image: UIImage(named: "Phone"),
+                    style: .plain,
+                    target: self,
+                    action: #selector(startCall)
+                )
+                callButton.accessibilityLabel = "Call"
+                callButton.isAccessibilityElement = true
+
+                navigationItem.rightBarButtonItems = [settingsButtonItem, callButton]
+            }
+            else {
+                navigationItem.rightBarButtonItems = [settingsButtonItem]
             }
         }
     }

Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift

@@ -9,7 +9,7 @@ import SessionMessagingKit
 import SessionUtilitiesKit
 import SessionSnodeKit
 
-class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, NavigationItemSource, NavigatableStateHolder, ObservableTableSource {
+class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, ObservableTableSource {
     typealias TableItem = String
 
     public let dependencies: Dependencies
@@ -47,10 +47,6 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
 
     // MARK: - Config
 
-    enum NavItem: Equatable {
-        case save
-    }
-
     public enum Section: SessionTableSection {
         case type
         case timerLegacy

Session/Conversations/Settings/ThreadNotificationSettingsViewModel.swift

@@ -0,0 +1,184 @@
+// Copyright © 2025 Rangeproof Pty Ltd. All rights reserved.
+
+import Foundation
+import Combine
+import GRDB
+import DifferenceKit
+import SessionUIKit
+import SessionMessagingKit
+import SessionUtilitiesKit
+import SessionSnodeKit
+
+class ThreadNotificationSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, ObservableTableSource {
+    public let dependencies: Dependencies
+    public let navigatableState: NavigatableState = NavigatableState()
+    public let state: TableDataState<Section, TableItem> = TableDataState()
+    public let observableState: ObservableTableSourceState<Section, TableItem> = ObservableTableSourceState()
+
+    private let threadViewModel: SessionThreadViewModel
+    private var threadViewModelSubject: CurrentValueSubject<SessionThreadViewModel, Never>
+
+    // MARK: - Initialization
+
+    init(
+        threadViewModel: SessionThreadViewModel,
+        using dependencies: Dependencies
+    ) {
+        self.dependencies = dependencies
+        self.threadViewModel = threadViewModel
+        self.threadViewModelSubject = CurrentValueSubject(threadViewModel)
+    }
+
+    // MARK: - Config
+
+    public enum Section: SessionTableSection {
+        case type
+    }
+
+    public enum TableItem: Differentiable {
+        case allMessages
+        case mentionsOnly
+        case mute
+    }
+
+    // MARK: - Content
+
+    let title: String = "sessionNotifications".localized()
+
+    lazy var footerButtonInfo: AnyPublisher<SessionButton.Info?, Never> = threadViewModelSubject
+        .map { [threadViewModel] updatedThreadViewModel -> Bool in
+            // Need to explicitly compare values because 'lastChangeTimestampMs' will differ
+            return (
+                updatedThreadViewModel.threadOnlyNotifyForMentions != threadViewModel.threadOnlyNotifyForMentions ||
+                updatedThreadViewModel.threadMutedUntilTimestamp != threadViewModel.threadMutedUntilTimestamp
+            )
+        }
+        .removeDuplicates()
+        .map { [weak self] shouldShowConfirmButton -> SessionButton.Info? in
+            guard shouldShowConfirmButton else { return nil }
+
+            return SessionButton.Info(
+                style: .bordered,
+                title: "set".localized(),
+                isEnabled: true,
+                accessibility: Accessibility(
+                    identifier: "Set button",
+                    label: "Set button"
+                ),
+                minWidth: 110,
+                onTap: {
+                    self?.saveChanges()
+                    self?.dismissScreen()
+                }
+            )
+        }
+        .eraseToAnyPublisher()
+
+    lazy var observation: TargetObservation = ObservationBuilder
+        .subject(threadViewModelSubject)
+        .compactMap { [weak self] threadViewModel -> [SectionModel]? in self?.content(threadViewModel) }
+
+    private func content(_ threadViewModel: SessionThreadViewModel) -> [SectionModel] {
+        let notificationTypeSection = SectionModel(
+            model: .type,
+            elements: [
+                SessionCell.Info(
+                    id: .allMessages,
+                    leadingAccessory: .icon(.volume2),
+                    title: "notificationsAllMessages".localized(),
+                    trailingAccessory: .radio(
+                        isSelected: (threadViewModel.threadOnlyNotifyForMentions != true && threadViewModel.threadMutedUntilTimestamp == nil),
+                        accessibility: Accessibility(
+                            identifier: "All messages - Radio"
+                        )
+                    ),
+                    accessibility: Accessibility(
+                        identifier: "All messages notification setting",
+                        label: "All messages"
+                    ),
+                    onTap: { [weak self] in
+                        self?.threadViewModelSubject.send(
+                            threadViewModel.with(
+                                threadMutedUntilTimestamp: nil
+                            ).with(
+                                threadOnlyNotifyForMentions: false
+                            )
+                        )
+                    }
+                ),
+
+                SessionCell.Info(
+                    id: .mentionsOnly,
+                    leadingAccessory: .icon(.atSign),
+                    title: "notificationsMentionsOnly".localized(),
+                    trailingAccessory: .radio(
+                        isSelected: (threadViewModel.threadOnlyNotifyForMentions == true),
+                        accessibility: Accessibility(
+                            identifier: "Mentions only - Radio"
+                        )
+                    ),
+                    accessibility: Accessibility(
+                        identifier: "Mentions only notification setting",
+                        label: "Mentions only"
+                    ),
+                    onTap: { [weak self] in
+                        self?.threadViewModelSubject.send(
+                            threadViewModel.with(
+                                threadMutedUntilTimestamp: nil
+                            ).with(
+                                threadOnlyNotifyForMentions: true
+                            )
+                        )
+                    }
+                ),
+
+                SessionCell.Info(
+                    id: .mute,
+                    leadingAccessory: .icon(.volumeOff),
+                    title: "notificationsMute".localized(),
+                    trailingAccessory: .radio(
+                        isSelected: (threadViewModel.threadMutedUntilTimestamp != nil),
+                        accessibility: Accessibility(
+                            identifier: "Mute - Radio"
+                        )
+                    ),
+                    accessibility: Accessibility(
+                        identifier: "\(ThreadSettingsViewModel.self).mute",
+                        label: "Mute notifications"
+                    ),
+                    onTap: { [weak self] in
+                        self?.threadViewModelSubject.send(
+                            threadViewModel.with(
+                                threadMutedUntilTimestamp: Date.distantFuture.timeIntervalSince1970
+                            ).with(
+                                threadOnlyNotifyForMentions: false
+                            )
+                        )
+                    }
+                )
+            ].compactMap { $0 }
+        )
+
+        return [notificationTypeSection]
+    }
+
+    // MARK: - Functions
+
+    private func saveChanges() {
+        let threadViewModel: SessionThreadViewModel = self.threadViewModelSubject.value
+
+        guard self.threadViewModel != threadViewModel else { return }
+
+        dependencies[singleton: .storage].writeAsync { db in
+            try SessionThread
+                .filter(id: threadViewModel.threadId)
+                .updateAll(
+                    db,
+                    SessionThread.Columns.onlyNotifyForMentions
+                        .set(to: threadViewModel.threadOnlyNotifyForMentions),
+                    SessionThread.Columns.mutedUntilTimestamp
+                        .set(to: threadViewModel.threadMutedUntilTimestamp)
+                )
+        }
+    }
+}