Merge pull request #306 from zapcannon87/developer

fix(IM): conversation decode binary last message is incorrect

Author: zapcannon87

LeanCloudTests/IMMessageTestCase.swift

@@ -757,6 +757,80 @@ class IMMessageTestCase: RTMBaseTestCase {
         XCTAssertTrue(success)
     }
 
+    func testBinaryMessage() {
+        guard let tuples = convenienceInit(),
+            let clientA = tuples.first?.client,
+            let clientB = tuples.last?.client,
+            let delegatorB = tuples.last?.delegator,
+            let conversation = tuples.first?.conversation else {
+                XCTFail()
+                return
+        }
+        
+        let binaryData = "bin".data(using: .utf8)!
+        let message = IMMessage()
+        try! message.set(content: .data(binaryData))
+        
+        expecting(count: 4) { (exp) in
+            delegatorB.conversationEvent = { client, conv, event in
+                switch event {
+                case .unreadMessageCountUpdated:
+                    exp.fulfill() // 2 times
+                case let .message(event: messageEvent):
+                    if case let .received(message: rMessage) = messageEvent {
+                        XCTAssertEqual(rMessage.content?.data, binaryData)
+                        conv.read()
+                        exp.fulfill()
+                    }
+                default:
+                    break
+                }
+            }
+            try! conversation.send(message: message, options: [.needReceipt]) { (result) in
+                XCTAssertTrue(result.isSuccess)
+                XCTAssertNil(result.error)
+                exp.fulfill()
+            }
+        }
+        
+        delay()
+        delegatorB.reset()
+        
+        expecting { (exp) in
+            let newMessage = IMMessage()
+            try! newMessage.set(content: .data(binaryData))
+            newMessage.isAllMembersMentioned = true
+            newMessage.mentionedMembers = [clientB.ID]
+            try! conversation.update(oldMessage: message, to: newMessage) { (result) in
+                XCTAssertTrue(result.isSuccess)
+                XCTAssertNil(result.error)
+                exp.fulfill()
+            }
+        }
+        
+        delay()
+        
+        expecting { (exp) in
+            let query = clientA.conversationQuery
+            query.options = [.containLastMessage]
+            try! query.getConversation(by: conversation.ID) { (result) in
+                XCTAssertTrue(result.isSuccess)
+                XCTAssertNil(result.error)
+                XCTAssertEqual(conversation.lastMessage?.content?.data, binaryData)
+                exp.fulfill()
+            }
+        }
+        
+        expecting { (exp) in
+            try! conversation.queryMessage { (result) in
+                XCTAssertTrue(result.isSuccess)
+                XCTAssertNil(result.error)
+                XCTAssertEqual(result.value?.first?.content?.data, binaryData)
+                exp.fulfill()
+            }
+        }
+    }
+    
     func testMessageUpdating() {
         let oldMessage = IMMessage()
         let oldContent: String = "old"
@@ -1326,7 +1400,6 @@ class IMMessageTestCase: RTMBaseTestCase {
         XCTAssertEqual(conversation.lastMessage?.ID, sentTuples.last?.0)
         XCTAssertEqual(conversation.lastMessage?.sentTimestamp, sentTuples.last?.1)
     }
-
 }
 
 extension IMMessageTestCase {

LeanCloudTests/LCFileTestCase.swift

@@ -246,3 +246,72 @@ class LCFileTestCase: BaseTestCase {
         }
     }
 }
+
+extension LCFileTestCase {
+    
+    static let usOldTestApp = try! LCApplication(
+        id: "kknqydxqd9wdq4cboy1dvvug5ha0ce3i2mrerrdrmr6pla1p",
+        key: "fate582pwsfh97s9o99nw91a152i7ndm9tsy866e6wpezth4",
+        serverURL: "https://beta-us.leancloud.cn"
+    )
+    
+    func testSaveUSOldTestApp() {
+        let fileURL = bundleResourceURL(name: "test", ext: "png")
+        let application = LCFileTestCase.usOldTestApp
+        
+        var file1: LCFile! = LCFile(
+            application: application,
+            payload: .fileURL(fileURL: fileURL))
+        XCTAssertTrue(file1.save().isSuccess)
+        XCTAssertNotNil(file1.mimeType)
+        XCTAssertNotNil(file1.key)
+        XCTAssertNotNil(file1.name)
+        XCTAssertNotNil(file1.metaData?.size as? LCNumber)
+        XCTAssertNotNil(file1.bucket)
+        XCTAssertNotNil(file1.provider)
+        XCTAssertNotNil(file1.url)
+        XCTAssertNotNil(file1.objectId)
+        XCTAssertNotNil(file1.createdAt)
+        XCTAssertNotNil(file1.save().error)
+        
+        var file2: LCFile! = LCFile(
+            application: application,
+            payload: .data(data: try! Data(contentsOf: fileURL)))
+        file2.name = "image.png"
+        XCTAssertTrue(file2.save().isSuccess)
+        XCTAssertNotNil(file2.mimeType)
+        XCTAssertNotNil(file2.key)
+        XCTAssertNotNil(file2.name)
+        XCTAssertNotNil(file2.metaData?.size as? LCNumber)
+        XCTAssertNotNil(file2.bucket)
+        XCTAssertNotNil(file2.provider)
+        XCTAssertNotNil(file2.url)
+        XCTAssertNotNil(file2.objectId)
+        XCTAssertNotNil(file2.createdAt)
+        XCTAssertNotNil(file2.save().error)
+        
+        var file3: LCFile! = LCFile(
+            application: application,
+            url: file2.url!)
+        XCTAssertTrue(file3.save().isSuccess)
+        XCTAssertNotNil(file3.mimeType)
+        XCTAssertNotNil(file3.name)
+        XCTAssertEqual(file3.metaData?.__source as? LCString, LCString("external"))
+        XCTAssertNotNil(file3.url)
+        XCTAssertNotNil(file3.objectId)
+        XCTAssertNotNil(file3.createdAt)
+        XCTAssertNotNil(file3.save().error)
+        
+        delay()
+        
+        weak var wFile1 = file1
+        weak var wFile2 = file2
+        weak var wFile3 = file3
+        file1 = nil
+        file2 = nil
+        file3 = nil
+        XCTAssertNil(wFile1)
+        XCTAssertNil(wFile2)
+        XCTAssertNil(wFile3)
+    }
+}

Sources/RTM/IMConversation.swift

@@ -2491,11 +2491,13 @@ extension IMConversation {
                 return nil
         }
         var content: IMMessage.Content? = nil
-        /* always check `binaryMsg` firstly */
-        if let data: Data = IMConversation.decoding(key: .lastMessageBinary, from: data) {
-            content = .data(data)
-        } else if let string: String = IMConversation.decoding(key: .lastMessageString, from: data) {
-            content = .string(string)
+        if let msg: String = IMConversation.decoding(key: .lastMessageString, from: data) {
+            if let isBinary: Bool = IMConversation.decoding(key: .lastMessageBinary, from: data), isBinary,
+                let data = Data(base64Encoded: msg) {
+                content = .data(data)
+            } else {
+                content = .string(msg)
+            }
         }
         return IMMessage.instance(
             application: client.application,