Merge 79eafa7df8 into f532496ee4

fix logic error for message ttl
Merge branch 'dev' into disappearing-message-redesign
2023-12-13 17:13:26 +11:00 · 2023-12-13 16:35:01 +11:00 · 2023-12-13 16:23:07 +11:00 · 2023-12-11 17:04:57 +11:00 · 2023-12-11 17:01:38 +11:00 · 2023-12-08 10:28:46 +11:00
4 changed files with 28 additions and 26 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/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/Receiving/MessageSender+Convenience.swift
+++ b/Receiving/MessageSender+Convenience.swift
@ -196,20 +196,24 @@ extension MessageSender {
    // MARK: - Convenience
    
    internal static func getSpecifiedTTL(
-        _ db: Database,
-        threadId: String,
        message: Message,
        isSyncMessage: Bool
    ) -> UInt64? {
-        guard
-            let disappearingMessagesConfiguration = try? DisappearingMessagesConfiguration.fetchOne(db, id: threadId),
-            disappearingMessagesConfiguration.isEnabled,
-            (
-                disappearingMessagesConfiguration.type == .disappearAfterSend ||
-                isSyncMessage
-            )
-        else { return nil }
+        guard let expiresInSeconds = message.expiresInSeconds else { return nil }
        
-        return UInt64(disappearingMessagesConfiguration.durationSeconds * 1000)
+        // Sync message
+        if isSyncMessage {
+            return UInt64(expiresInSeconds * 1000)
+        }
+        
+        // Disappear after send
+        if let expiresStartedAtMs = message.expiresStartedAtMs,
+            let sentTimestamp = message.sentTimestamp,
+            UInt64(expiresStartedAtMs) == sentTimestamp
+        {
+            return UInt64(expiresInSeconds * 1000)
+        }
+        
+        return nil
    }
 }
--- a/Receiving/MessageSender.swift
+++ b/Receiving/MessageSender.swift
@ -349,7 +349,7 @@ public final class MessageSender {
            recipient: message.recipient!,
            data: base64EncodedData,
            ttl: MessageSender
-                .getSpecifiedTTL(db, threadId: threadId, message: message, isSyncMessage: isSyncMessage)
+                .getSpecifiedTTL(message: message, isSyncMessage: isSyncMessage)
                .defaulting(to: message.ttl),
            timestampMs: UInt64(messageSendTimestamp)
        )
Author	SHA1	Message	Date
RyanZhao	d8f7c6ed61	Merge `79eafa7df8` into `f532496ee4`	2023-12-13 17:13:26 +11:00
Ryan ZHAO	79eafa7df8	fix logic error for message ttl	2023-12-13 16:35:01 +11:00
Ryan ZHAO	3667d304f2	Merge branch 'dev' into disappearing-message-redesign	2023-12-13 16:23:07 +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	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