Added new 'animationsEnabled' feature flag, message deletion tweaks

Session/Conversations/ConversationVC+Interaction.swift

@@ -1450,7 +1450,11 @@ extension ConversationVC:
             at: [IndexPath(row: targetMessageIndex, section: messageSectionIndex)],
             with: .none
         )
-        UIView.setAnimationsEnabled(true)
+        
+        // Only re-enable animations if the feature flag isn't disabled
+        if viewModel.dependencies[feature: .animationsEnabled] {
+            UIView.setAnimationsEnabled(true)
+        }
     }
     
     func react(_ cellViewModel: MessageViewModel, with emoji: EmojiWithSkinTones) {

Session/Media Viewing & Editing/DocumentTitleViewController.swift

@@ -208,7 +208,7 @@ public class DocumentTileViewController: UIViewController, UITableViewDelegate,
     ) {
         // Ensure the first load runs without animations (if we don't do this the cells will animate
         // in from a frame of CGRect.zero)
-        guard hasLoadedInitialData else {
+        guard hasLoadedInitialData && viewModel.dependencies[feature: .animationsEnabled] else {
             self.viewModel.updateGalleryData(updatedGalleryData)
             
             UIView.performWithoutAnimation {

Session/Media Viewing & Editing/MediaTileViewController.swift

@@ -313,7 +313,7 @@ public class MediaTileViewController: UIViewController, UICollectionViewDataSour
     ) {
         // Ensure the first load runs without animations (if we don't do this the cells will animate
         // in from a frame of CGRect.zero)
-        guard hasLoadedInitialData else {
+        guard hasLoadedInitialData && viewModel.dependencies[feature: .animationsEnabled] else {
             self.viewModel.updateGalleryData(updatedGalleryData)
             self.updateSelectButton(updatedData: updatedGalleryData, inBatchSelectMode: isInBatchSelectMode)
             

Session/Meta/AppDelegate.swift

@@ -68,7 +68,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 Log.setup(with: Logger(primaryPrefix: "Session", level: .info, using: dependencies))
                 Log.info(.cat, "Setting up environment.")
                 
-                /// Create a proper `NotificationPresenter` and `SessionCallManager` for the main app (defaults to a no-op version)
+                /// Create a proper `NotificationPresenter` and `SessionCallManager` for the main app (defaults to no-op versions)
                 dependencies.set(singleton: .notificationsManager, to: NotificationPresenter(using: dependencies))
                 dependencies.set(singleton: .callManager, to: SessionCallManager(using: dependencies))
                 

Session/Settings/DeveloperSettingsViewModel.swift

@@ -63,6 +63,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
     public enum TableItem: Hashable, Differentiable, CaseIterable {
         case developerMode
         
+        case animationsEnabled
         case showStringKeys
         
         case defaultLogLevel
@@ -97,6 +98,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
         public var differenceIdentifier: String {
             switch self {
                 case .developerMode: return "developerMode"
+                case .animationsEnabled: return "animationsEnabled"
                 case .showStringKeys: return "showStringKeys"
                 
                 case .defaultLogLevel: return "defaultLogLevel"
@@ -134,6 +136,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
             var result: [TableItem] = []
             switch TableItem.developerMode {
                 case .developerMode: result.append(.developerMode); fallthrough
+                case .animationsEnabled: result.append(.animationsEnabled); fallthrough
                 case .showStringKeys: result.append(.showStringKeys); fallthrough
                 
                 case .defaultLogLevel: result.append(.defaultLogLevel); fallthrough
@@ -172,6 +175,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
     private struct State: Equatable {
         let developerMode: Bool
         
+        let animationsEnabled: Bool
         let showStringKeys: Bool
         
         let defaultLogLevel: Log.Level
@@ -202,6 +206,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
         .refreshableData(self) { [weak self, dependencies] () -> State in
             State(
                 developerMode: dependencies[singleton: .storage, key: .developerModeEnabled],
+                animationsEnabled: dependencies[feature: .animationsEnabled],
                 showStringKeys: dependencies[feature: .showStringKeys],
                 
                 defaultLogLevel: dependencies[feature: .logLevel(cat: .default)],
@@ -257,6 +262,25 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
         let general: SectionModel = SectionModel(
             model: .general,
             elements: [
+                SessionCell.Info(
+                    id: .animationsEnabled,
+                    title: "Animations Enabled",
+                    subtitle: """
+                    Controls whether animations are enabled throughout the app
+                    
+                    Note: There may be some custom or low-level animations which can't be disabled via this setting
+                    """,
+                    trailingAccessory: .toggle(
+                        current.animationsEnabled,
+                        oldValue: previous?.animationsEnabled
+                    ),
+                    onTap: { [weak self] in
+                        self?.updateFlag(
+                            for: .animationsEnabled,
+                            to: !current.animationsEnabled
+                        )
+                    }
+                ),
                 SessionCell.Info(
                     id: .showStringKeys,
                     title: "Show String Keys",
@@ -688,6 +712,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
         TableItem.allCases.forEach { item in
             switch item {
                 case .developerMode: break      // Not a feature
+                case .animationsEnabled: updateFlag(for: .animationsEnabled, to: nil)
                 case .showStringKeys: updateFlag(for: .showStringKeys, to: nil)
                 
                 case .resetSnodeCache: break    // Not a feature

SessionMessagingKit/Database/Models/Interaction.swift

@@ -845,8 +845,24 @@ public extension Interaction {
         return (expiresInSeconds ?? 0 > 0)
     }
     
+    var notificationIdentifiers: [String] {
+        [
+            notificationIdentifier(shouldGroupMessagesForThread: true),
+            notificationIdentifier(shouldGroupMessagesForThread: false)
+        ]
+    }
+    
     // MARK: - Functions
     
+    func notificationIdentifier(shouldGroupMessagesForThread: Bool) -> String {
+        // When the app is in the background we want the notifications to be grouped to prevent spam
+        return Interaction.notificationIdentifier(
+            for: (id ?? 0),
+            threadId: threadId,
+            shouldGroupMessagesForThread: shouldGroupMessagesForThread
+        )
+    }
+    
     static func notificationIdentifier(for id: Int64, threadId: String, shouldGroupMessagesForThread: Bool) -> String {
         // When the app is in the background we want the notifications to be grouped to prevent spam
         guard !shouldGroupMessagesForThread else { return threadId }
@@ -1247,10 +1263,12 @@ public extension Interaction {
         public enum CodingKeys: String, CodingKey, ColumnExpression {
             case id
             case variant
+            case serverHash
         }
         
         let id: Int64
         let variant: Interaction.Variant
+        let serverHash: String?
     }
     
     /// When deleting a message we should also delete any reactions which were on the message, so fetch and
@@ -1286,7 +1304,7 @@ public extension Interaction {
     ) throws {
         let interactionInfo: [InteractionVariantInfo] = try Interaction
             .filter(ids: interactionIds)
-            .select(.id, .variant)
+            .select(.id, .variant, .serverHash)
             .asRequest(of: InteractionVariantInfo.self)
             .fetchAll(db)
         
@@ -1324,6 +1342,19 @@ public extension Interaction {
         /// Delete any attachments from the database
         try attachments.forEach { try $0.delete(db) }
         
+        /// Remove the `SnodeReceivedMessageInfo` records (otherwise we might try to poll for a hash which no longer exists, resulting
+        /// in fetching the last 14 days of messages)
+        let serverHashes: Set<String> = interactionInfo.compactMap(\.serverHash).asSet()
+        
+        if !serverHashes.isEmpty {
+            _ = try SnodeReceivedMessageInfo
+                .filter(serverHashes.contains(SnodeReceivedMessageInfo.Columns.hash))
+                .updateAll(
+                    db,
+                    SnodeReceivedMessageInfo.Columns.wasDeletedOrInvalid.set(to: true)
+                )
+        }
+        
         /// Mark the messages as deleted (ie. remove as much message data as we can)
         try interactionInfo.grouped(by: { $0.variant }).forEach { variant, info in
             let targetVariant: Interaction.Variant = {

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+UnsendRequests.swift

@@ -33,14 +33,31 @@ extension MessageReceiver {
         else { return }
         guard let author: String = message.author, let timestampMs: UInt64 = message.timestamp else { return }
         
-        let maybeInteractionId: Int64? = try Interaction
+        let maybeInteraction: Interaction? = try Interaction
             .filter(Interaction.Columns.timestampMs == Int64(timestampMs))
             .filter(Interaction.Columns.authorId == author)
-            .select(.id)
-            .asRequest(of: Int64.self)
             .fetchOne(db)
         
-        guard let interactionId: Int64 = maybeInteractionId else { return }
+        guard
+            let interactionId: Int64 = maybeInteraction?.id,
+            let interaction: Interaction = maybeInteraction
+        else { return }
+        
+        // Mark incoming messages as read and remove any of their notifications
+        if interaction.variant == .standardIncoming {
+            try Interaction.markAsRead(
+                db,
+                interactionId: interactionId,
+                threadId: interaction.threadId,
+                threadVariant: threadVariant,
+                includingOlder: false,
+                trySendReadReceipt: false,
+                using: dependencies
+            )
+            
+            UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: interaction.notificationIdentifiers)
+            UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: interaction.notificationIdentifiers)
+        }
         
         /// Retrieve the hashes which should be deleted first (these will be removed by marking the message as deleted)
         let hashes: Set<String> = try Interaction.serverHashesForDeletion(

SessionUtilitiesKit/General/Feature.swift

@@ -10,6 +10,11 @@ public final class Features {
 }
 
 public extension FeatureStorage {
+    static let animationsEnabled: FeatureConfig<Bool> = Dependencies.create(
+        identifier: "animationsEnabled",
+        defaultOption: true
+    )
+    
     static let showStringKeys: FeatureConfig<Bool> = Dependencies.create(
         identifier: "showStringKeys"
     )