Fixed broken message sending for TestFlight build

• Fixed broken unit tests
• Fixed some incorrect logic for validating a message

Session.xcodeproj/project.pbxproj

@@ -7935,7 +7935,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 539;
+				CURRENT_PROJECT_VERSION = 540;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -8011,7 +8011,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 539;
+				CURRENT_PROJECT_VERSION = 540;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift

@@ -157,7 +157,7 @@ public final class ClosedGroupControlMessage: ControlMessage {
         public var publicKey: String?
         public var encryptedKeyPair: Data?
 
-        public func isValid(using dependencies: Dependencies) -> Bool { publicKey != nil && encryptedKeyPair != nil }
+        public func isValid(isSending: Bool) -> Bool { publicKey != nil && encryptedKeyPair != nil }
 
         public init(publicKey: String, encryptedKeyPair: Data) {
             self.publicKey = publicKey
@@ -192,8 +192,8 @@ public final class ClosedGroupControlMessage: ControlMessage {
 
     // MARK: - Validation
     
-    public override func isValid(using dependencies: Dependencies) -> Bool {
-        guard super.isValid(using: dependencies), let kind = kind else { return false }
+    public override func isValid(isSending: Bool) -> Bool {
+        guard super.isValid(isSending: isSending), let kind = kind else { return false }
         
         switch kind {
             case .new(let publicKey, let name, let encryptionKeyPair, let members, let admins, _):

SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift

@@ -42,8 +42,8 @@ public final class DataExtractionNotification: ControlMessage {
 
     // MARK: - Validation
     
-    public override func isValid(using dependencies: Dependencies) -> Bool {
-        guard super.isValid(using: dependencies), let kind = kind else { return false }
+    public override func isValid(isSending: Bool) -> Bool {
+        guard super.isValid(isSending: isSending), let kind = kind else { return false }
         
         switch kind {
             case .screenshot: return true

SessionMessagingKit/Messages/Control Messages/ReadReceipt.swift

@@ -21,8 +21,8 @@ public final class ReadReceipt: ControlMessage {
 
     // MARK: - Validation
     
-    public override func isValid(using dependencies: Dependencies) -> Bool {
-        guard super.isValid(using: dependencies) else { return false }
+    public override func isValid(isSending: Bool) -> Bool {
+        guard super.isValid(isSending: isSending) else { return false }
         if let timestamps = timestamps, !timestamps.isEmpty { return true }
         return false
     }

SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift

@@ -43,8 +43,8 @@ public final class TypingIndicator: ControlMessage {
 
     // MARK: - Validation
     
-    public override func isValid(using dependencies: Dependencies) -> Bool {
-        guard super.isValid(using: dependencies) else { return false }
+    public override func isValid(isSending: Bool) -> Bool {
+        guard super.isValid(isSending: isSending) else { return false }
         return kind != nil
     }
 

SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift

@@ -17,8 +17,8 @@ public final class UnsendRequest: ControlMessage {
     
     // MARK: - Validation
     
-    public override func isValid(using dependencies: Dependencies) -> Bool {
-        guard super.isValid(using: dependencies) else { return false }
+    public override func isValid(isSending: Bool) -> Bool {
+        guard super.isValid(isSending: isSending) else { return false }
         
         return timestamp != nil && author != nil
     }

SessionMessagingKit/Messages/LibSessionMessage.swift

@@ -13,7 +13,7 @@ public final class LibSessionMessage: Message, NotProtoConvertible {
     
     // MARK: - Validation
     
-    public override func isValid(using dependencies: Dependencies) -> Bool {
+    public override func isValid(isSending: Bool) -> Bool {
         return !ciphertext.isEmpty
     }
 

SessionMessagingKit/Messages/Message.swift

@@ -44,10 +44,22 @@ public class Message: Codable {
 
     // MARK: - Validation
     
-    public func isValid(using dependencies: Dependencies) -> Bool {
-        if let sentTimestampMs = sentTimestampMs { guard sentTimestampMs > 0 else { return false } }
-        if let receivedTimestampMs = receivedTimestampMs { guard receivedTimestampMs > 0 else { return false } }
-        return sender != nil
+    public func isValid(isSending: Bool) -> Bool {
+        guard
+            let sentTimestampMs: UInt64 = sentTimestampMs,
+            sentTimestampMs > 0,
+            sender != nil
+        else { return false }
+        
+        /// If this is an incoming message then ensure we also have a received timestamp
+        if !isSending {
+            guard
+                let receivedTimestampMs: UInt64 = receivedTimestampMs,
+                receivedTimestampMs > 0
+            else { return false }
+        }
+        
+        return true
     }
     
     // MARK: - Initialization

SessionMessagingKit/Messages/Visible Messages/VisibleMessage+Attachment.swift

@@ -21,7 +21,7 @@ public extension VisibleMessage {
         public var sizeInBytes: UInt?
         public var url: String?
 
-        public func isValid(using dependencies: Dependencies) -> Bool {
+        public func isValid(isSending: Bool) -> Bool {
             // key and digest can be nil for open group attachments
             contentType != nil && kind != nil && size != nil && sizeInBytes != nil && url != nil
         }

SessionMessagingKit/Messages/Visible Messages/VisibleMessage+LinkPreview.swift

@@ -10,7 +10,7 @@ public extension VisibleMessage {
         public let url: String?
         public let attachmentId: String?
 
-        public func isValid(using dependencies: Dependencies) -> Bool { title != nil && url != nil && attachmentId != nil }
+        public func isValid(isSending: Bool) -> Bool { title != nil && url != nil && attachmentId != nil }
         
         // MARK: - Initialization
 

SessionMessagingKit/Messages/Visible Messages/VisibleMessage+Quote.swift

@@ -12,7 +12,7 @@ public extension VisibleMessage {
         public let text: String?
         public let attachmentId: String?
 
-        public func isValid(using dependencies: Dependencies) -> Bool { timestamp != nil && publicKey != nil }
+        public func isValid(isSending: Bool) -> Bool { timestamp != nil && publicKey != nil }
         
         // MARK: - Initialization
 

SessionMessagingKit/Messages/Visible Messages/VisibleMessage+Reaction.swift

@@ -18,7 +18,7 @@ public extension VisibleMessage {
         /// This is the behaviour for the reaction
         public var kind: Kind
         
-        public func isValid(using dependencies: Dependencies) -> Bool { true }
+        public func isValid(isSending: Bool) -> Bool { true }
         
         // MARK: - Kind
         

SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift

@@ -34,8 +34,8 @@ public final class VisibleMessage: Message {
     
     // MARK: - Validation
     
-    public override func isValid(using dependencies: Dependencies) -> Bool {
-        guard super.isValid(using: dependencies) else { return false }
+    public override func isValid(isSending: Bool) -> Bool {
+        guard super.isValid(isSending: isSending) else { return false }
         if !attachmentIds.isEmpty || dataMessageHasAttachments == true { return true }
         if openGroupInvitation != nil { return true }
         if reaction != nil { return true }

SessionMessagingKit/Sending & Receiving/MessageReceiver.swift

@@ -269,7 +269,7 @@ public enum MessageReceiver {
         }
         
         // Validate
-        guard message.isValid(using: dependencies) else {
+        guard message.isValid(isSending: false) else {
             throw MessageReceiverError.invalidMessage
         }
         

SessionMessagingKit/Sending & Receiving/MessageSender.swift

@@ -568,7 +568,7 @@ public final class MessageSender {
         using dependencies: Dependencies
     ) throws {
         /// Check the message itself is valid
-        guard message.isValid(using: dependencies) else { throw MessageSenderError.invalidMessage }
+        guard message.isValid(isSending: true) else { throw MessageSenderError.invalidMessage }
         
         /// We now allow the creation of message data without validating it's attachments have finished uploading first, this is here to
         /// ensure we don't send a message which should have uploaded files

SessionMessagingKitTests/Sending & Receiving/MessageSenderSpec.swift

@@ -37,6 +37,11 @@ class MessageSenderSpec: QuickSpec {
                     .thenReturn(Array(Data(base64Encoded: "pbTUizreT0sqJ2R2LloseQDyVL2RYztD")!))
             }
         )
+        @TestState(cache: .general, in: dependencies) var mockGeneralCache: MockGeneralCache! = MockGeneralCache(
+            initialSetup: { cache in
+                cache.when { $0.sessionId }.thenReturn(SessionId(.standard, hex: TestConstants.publicKey))
+            }
+        )
         
         // MARK: - a MessageSender
         describe("a MessageSender") {

SessionMessagingKitTests/_TestUtilities/MockPoller.swift

@@ -74,6 +74,8 @@ class MockPoller: Mock<PollerType>, PollerType {
     
     func startIfNeeded() { mockNoReturn() }
     func stop() { mockNoReturn() }
+    
+    func pollerDidStart() { mockNoReturn() }
     func poll(forceSynchronousProcessing: Bool) -> AnyPublisher<PollResult, Error> { mock(args: [forceSynchronousProcessing]) }
     func nextPollDelay() -> TimeInterval { mock() }
     func handlePollError(_ error: Error, _ lastError: Error?) -> PollerErrorResponse { mock(args: [error, lastError]) }

SessionMessagingKitTests/_TestUtilities/MockSwarmPoller.swift

@@ -70,6 +70,8 @@ class MockSwarmPoller: Mock<SwarmPollerType & PollerType>, SwarmPollerType & Pol
     
     func startIfNeeded() { mockNoReturn() }
     func stop() { mockNoReturn() }
+    
+    func pollerDidStart() { mockNoReturn() }
     func poll(forceSynchronousProcessing: Bool) -> AnyPublisher<PollResult, Error> { mock(args: [forceSynchronousProcessing]) }
     func nextPollDelay() -> TimeInterval { mock() }
     func handlePollError(_ error: Error, _ lastError: Error?) -> PollerErrorResponse { mock(args: [error, lastError]) }