Merge pull request #568 from zapcannon87/master

Release v11.6.6

AVOS/AVOSCloud/File/AVFile.m

@@ -96,7 +96,7 @@ - (instancetype)init
 
         _lock = [[NSLock alloc] init];
 
-        _rawJSONData = [NSMutableDictionary dictionaryWithObject:AVFile.className forKey:kLCFile___type];
+        _rawJSONData = [NSMutableDictionary dictionary];
     }
 
     return self;
@@ -310,7 +310,9 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder
 
 - (void)encodeWithCoder:(NSCoder *)aCoder
 {
-    [aCoder encodeObject:_rawJSONData forKey:@"dictionary"];
+    NSMutableDictionary *dic = [_rawJSONData mutableCopy];
+    [dic setObject:@"File" forKey:@"__type"];
+    [aCoder encodeObject:dic forKey:@"dictionary"];
 }
 
 // MARK: - Lock

AVOS/AVOSCloud/Object/AVObjectUtils.m

@@ -617,7 +617,9 @@ +(NSDictionary *)dictionaryFromData:(NSData *)data
 
 +(NSDictionary *)dictionaryFromFile:(AVFile *)file
 {
-    return [file rawJSONDataCopy];
+    NSMutableDictionary *dic = [file rawJSONDataMutableCopy];
+    [dic setObject:@"File" forKey:@"__type"];
+    return dic;
 }
 
 +(NSDictionary *)dictionaryFromACL:(AVACL *)acl {

AVOS/AVOSCloud/Push/AVInstallation.m

@@ -48,6 +48,14 @@ + (AVInstallation *)defaultInstallation
     dispatch_once(&onceToken, ^{
 
         installation = [[AVInstallation alloc] init];
+
+        NSString *path = [AVPersistenceUtils currentInstallationArchivePath];
+        if ([AVPersistenceUtils fileExist:path]) {
+            NSMutableDictionary *installationDict = [NSMutableDictionary dictionaryWithDictionary:[AVPersistenceUtils getJSONFromPath:path]];
+            if (installationDict) {
+                [AVObjectUtils copyDictionary:installationDict toObject:installation];
+            }
+        }
     });
 
     return installation;
@@ -61,14 +69,6 @@ - (id)init
         self.deviceType = [AVInstallation deviceType];
         self.timeZone   = [[NSTimeZone systemTimeZone] name];
         self.apnsTopic  = [NSBundle mainBundle].bundleIdentifier;
-
-        NSString *path = [AVPersistenceUtils currentInstallationArchivePath];
-        if ([AVPersistenceUtils fileExist:path]) {
-            NSMutableDictionary *installationDict = [NSMutableDictionary dictionaryWithDictionary:[AVPersistenceUtils getJSONFromPath:path]];
-            if (installationDict) {
-                [AVObjectUtils copyDictionary:installationDict toObject:self];
-            }
-        }
     }
     return self;
 }
@@ -132,6 +132,8 @@ +(NSString *)deviceType
 
 - (NSMutableDictionary *)installationDictionaryForCache {
     NSMutableDictionary *data = [self postData];
+    [data removeObjectForKey:@"__type"];
+    [data removeObjectForKey:@"className"];
     return data;
 }
 

AVOS/AVOSCloud/UserAgent.h

@@ -1 +1 @@
-#define SDK_VERSION @"v11.6.5"
+#define SDK_VERSION @"v11.6.6"

AVOS/AVOSCloudIM/Conversation/AVIMConversation.m

@@ -1326,6 +1326,7 @@ - (void)sendMessage:(AVIMMessage *)message
     }
 
     if (client.status != AVIMClientStatusOpened) {
+        message.status = AVIMMessageStatusFailed;
         [self invokeInUserInteractQueue:^{
             callback(false, ({
                 AVIMErrorCode code = AVIMErrorCodeClientNotOpen;

AVOS/AVOSCloudTests/Swift/AVCloudTestCase.swift

@@ -7,7 +7,18 @@
 //
 
 import XCTest
+import AVOSCloud
 
 class AVCloud_TestCase: LCTestBase {
 
+    func testError() {
+        let exp = self.expectation(description: "error")
+        AVCloud.callFunction(inBackground: "error", withParameters: nil) { (result, error) in
+            XCTAssertNil(result)
+            XCTAssertNotNil(error)
+            exp.fulfill()
+        }
+        wait(for: [exp], timeout: 30)
+    }
+
 }

AVOS/AVOSCloudTests/Swift/AVObjectTestCase.swift

@@ -14,6 +14,8 @@ class AVObject_TestCase: LCTestBase {
 
         if self.isServerTesting { return }
 
+        var objectID: String?
+
         RunLoopSemaphore.wait(async: { (semaphore: RunLoopSemaphore) in
 
             let filePath: String = Bundle(for: type(of: self)).path(forResource: "_10_MB_", ofType: "png")!
@@ -35,7 +37,7 @@ class AVObject_TestCase: LCTestBase {
                 semaphore.decrement()
 
                 XCTAssertTrue(Thread.isMainThread)
-
+                objectID = avObject.objectId
                 XCTAssertTrue(succeeded)
                 XCTAssertNil(error)
             })
@@ -44,6 +46,11 @@ class AVObject_TestCase: LCTestBase {
 
             XCTFail("timeout")
         })
+
+        if let objectID = objectID {
+            let object = AVObject(className: "Todo", objectId: objectID)
+            XCTAssertTrue(object.fetch())
+        }
     }
 
     func testc_fetch_all_objects() {
@@ -88,4 +95,9 @@ class AVObject_TestCase: LCTestBase {
         })
     }
 
+    func testInstallation() {
+        AVInstallation.default().deviceToken = UUID().uuidString
+        XCTAssertTrue(AVInstallation.default().save())
+    }
+
 }

AVOSCloud.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloud'
-  s.version  = '11.6.5'
+  s.version  = '11.6.6'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud Objective-C SDK'
   s.authors  = 'LeanCloud'

AVOSCloudIM.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudIM'
-  s.version  = '11.6.5'
+  s.version  = '11.6.6'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud IM Objective-C SDK'
   s.authors  = 'LeanCloud'

AVOSCloudLiveQuery.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudLiveQuery'
-  s.version  = '11.6.5'
+  s.version  = '11.6.6'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud LiveQuery Objective-C SDK'
   s.authors  = 'LeanCloud'