Merge 2fc021c48c into f532496ee4

fix an edge case where there is no expiration info for messages already expired
Increased build and version numbers
2023-12-12 14:05:57 +11:00 · 2023-12-12 13:51:12 +11:00 · 2023-12-11 17:04:57 +11:00 · 2023-12-11 17:01:38 +11:00 · 2023-12-11 16:48:19 +11:00 · 2023-12-11 16:22:05 +11:00
5 changed files with 55 additions and 22 deletions
--- a/Session.xcodeproj/project.pbxproj
+++ b/Session.xcodeproj/project.pbxproj
@ -6682,7 +6682,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 427;
+				CURRENT_PROJECT_VERSION = 428;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@ -6706,7 +6706,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.4.3;
+				MARKETING_VERSION = 2.4.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.ShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@ -6754,7 +6754,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 427;
+				CURRENT_PROJECT_VERSION = 428;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				ENABLE_NS_ASSERTIONS = NO;
@ -6783,7 +6783,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.4.3;
+				MARKETING_VERSION = 2.4.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.ShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@ -6819,7 +6819,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 427;
+				CURRENT_PROJECT_VERSION = 428;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@ -6842,7 +6842,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.4.3;
+				MARKETING_VERSION = 2.4.4;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.NotificationServiceExtension";
@ -6893,7 +6893,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 427;
+				CURRENT_PROJECT_VERSION = 428;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				ENABLE_NS_ASSERTIONS = NO;
@ -6921,7 +6921,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.4.3;
+				MARKETING_VERSION = 2.4.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.NotificationServiceExtension";
@ -7853,7 +7853,7 @@
 				CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 427;
+				CURRENT_PROJECT_VERSION = 428;
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@ -7891,7 +7891,7 @@
 					"$(SRCROOT)",
 				);
 				LLVM_LTO = NO;
-				MARKETING_VERSION = 2.4.3;
+				MARKETING_VERSION = 2.4.4;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger";
@ -7924,7 +7924,7 @@
 				CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 427;
+				CURRENT_PROJECT_VERSION = 428;
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@ -7962,7 +7962,7 @@
 					"$(SRCROOT)",
 				);
 				LLVM_LTO = NO;
-				MARKETING_VERSION = 2.4.3;
+				MARKETING_VERSION = 2.4.4;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger";
 				PRODUCT_NAME = Session;
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
@ -494,13 +494,16 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
                guard !Features.useNewDisappearingMessagesConfig else { return nil }
                return UInt32(floor(updatedConfig.isEnabled ? updatedConfig.durationSeconds : 0))
            }()
+            
+            let expirationTimerUpdateMessage: ExpirationTimerUpdate = ExpirationTimerUpdate(
+                syncTarget: nil,
+                duration: duration
+            )
+            expirationTimerUpdateMessage.sentTimestamp = UInt64(currentTimestampMs)

            try MessageSender.send(
                db,
-                message: ExpirationTimerUpdate(
-                    syncTarget: nil,
-                    duration: duration
-                ),
+                message: expirationTimerUpdateMessage,
                interactionId: interactionId,
                threadId: threadId,
                threadVariant: threadVariant,
--- a/Session/Meta/TurnServers/Session-Turn-Server
+++ b/Session/Meta/TurnServers/Session-Turn-Server
@ -1,7 +1,5 @@
 {
    "urls": ["turn:freyr.getsession.org",
-             "turn:fenrir.getsession.org",
-             "turn:frigg.getsession.org",
             "turn:angus.getsession.org",
             "turn:hereford.getsession.org",
             "turn:holstein.getsession.org",
--- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
+++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
@ -276,6 +276,22 @@ public extension DisappearingMessagesConfiguration {
            }
        }
        
+        let expiresStartedAtMs: Double? = {
+            if updatedConfiguration.type == .disappearAfterSend ||
+                SessionUtil.timestampAlreadyRead(
+                    threadId: threadId,
+                    threadVariant: threadVariant,
+                    timestampMs: timestampMs,
+                    userPublicKey: getUserHexEncodedPublicKey(db),
+                    openGroup: nil
+                )
+            {
+                return Double(timestampMs)
+            }
+            
+            return nil
+        }()
+        
        let interaction = try Interaction(
            serverHash: serverHash,
            threadId: threadId,
@ -288,7 +304,7 @@ public extension DisappearingMessagesConfiguration {
            ),
            timestampMs: timestampMs,
            expiresInSeconds: updatedConfiguration.durationSeconds,
-            expiresStartedAtMs: (updatedConfiguration.type == .disappearAfterSend ? Double(timestampMs) : nil)
+            expiresStartedAtMs: expiresStartedAtMs
        ).inserted(db)
        
        return interaction.id
--- a/SessionMessagingKit/Jobs/Types/GetExpirationJob.swift
+++ b/SessionMessagingKit/Jobs/Types/GetExpirationJob.swift
@ -72,7 +72,7 @@ public enum GetExpirationJob: JobExecutor {
                            
                            result[next.key] = TimeInterval(next.value - UInt64(expiresInSeconds * 1000))
                        }
-                    let hashesToUseDefault: Set<String> = Set(expirationInfo.keys)
+                    var hashesWithNoExiprationInfo: Set<String> = Set(expirationInfo.keys)
                        .subtracting(serverSpecifiedExpirationStartTimesMs.keys)
                    
                    dependencies.storage.write(using: dependencies) { db in
@ -85,8 +85,24 @@ public enum GetExpirationJob: JobExecutor {
                                )
                        }
                        
+                        let inferredExpiredMessageHashes: Set<String> = (try? Interaction
+                            .select(Interaction.Columns.serverHash)
+                            .filter(hashesWithNoExiprationInfo.contains(Interaction.Columns.serverHash))
+                            .filter(Interaction.Columns.timestampMs + (Interaction.Columns.expiresInSeconds * 1000) <= details.startedAtTimestampMs)
+                            .asRequest(of: String.self)
+                            .fetchSet(db))
+                            .defaulting(to: [])
+                        
+                        hashesWithNoExiprationInfo = hashesWithNoExiprationInfo.subtracting(inferredExpiredMessageHashes)
+                        
+                        if !inferredExpiredMessageHashes.isEmpty {
+                            try Interaction
+                                .filter(inferredExpiredMessageHashes.contains(Interaction.Columns.serverHash))
+                                .deleteAll(db)
+                        }
+                        
                        try Interaction
-                            .filter(hashesToUseDefault.contains(Interaction.Columns.serverHash))
+                            .filter(hashesWithNoExiprationInfo.contains(Interaction.Columns.serverHash))
                            .filter(Interaction.Columns.expiresStartedAtMs == nil)
                            .updateAll(
                                db,
@ -102,7 +118,7 @@ public enum GetExpirationJob: JobExecutor {
                            )
                    }
                    
-                    guard hashesToUseDefault.isEmpty else {
+                    guard hashesWithNoExiprationInfo.isEmpty else {
                        let updatedJob: Job? = dependencies.storage.write(using: dependencies) { db in
                            try job
                                .with(nextRunTimestamp: dependencies.dateNow.timeIntervalSince1970 + minRunFrequency)
Author	SHA1	Message	Date
RyanZhao	b375d01e62	Merge `2fc021c48c` into `f532496ee4`	2023-12-12 14:05:57 +11:00
Ryan ZHAO	2fc021c48c	fix an edge case where there is no expiration info for messages already expired	2023-12-12 13:51:12 +11:00
Morgan Pretty	f532496ee4	Increased build and version numbers	2023-12-11 17:04:57 +11:00
Morgan Pretty	d8dc801e5f	Merge pull request #939 from RyanRory/turn-server-fix TURN server fix	2023-12-11 17:01:38 +11:00
Ryan ZHAO	0aa32bcab3	fix an issue where expiration update control messages won't be marked as read on linked devices	2023-12-11 16:48:19 +11:00
Ryan ZHAO	b22fe40d6e	fix an issue where received expiration update control message should already be read	2023-12-11 16:22:05 +11:00
Ryan ZHAO	6d2e0b457e	fix: wrong server removed	2023-12-08 10:28:46 +11:00
Ryan ZHAO	e6cf75dd3f	remove frigg&fenrir turn servers for now	2023-12-08 10:26:48 +11:00