Merge pull request #227 from olgadanylova/master

macOS device registration fixed

Author: Olha Danylova

CHANGELOG.md

@@ -1,7 +1,8 @@
 # RELEASE HISTORY
 
-## -
+## 5.2.13 May, 13 2019
 * added support of sortBy and properties for LoadRelationsQueryBuilder
+* macOS device registration fixed
 
 ## 5.2.12 March, 26 2019
 * podspec updated to support Socket.IO v14.0.0

SDK/Podfile.lock

@@ -17,4 +17,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 675cc991d5f2f8cb6bcd0ce2d67444ed1b8f2a74
 
-COCOAPODS: 1.7.0.beta.3
+COCOAPODS: 1.7.0.rc.1

SDK/backendlessAPI/Classes/Messaging/MessagingService.m

@@ -90,7 +90,7 @@ -(NSString *)serialNumber {
     if (!UUID) {
         CFUUIDRef uuid = CFUUIDCreate(NULL);
         UUID = (__bridge NSString *)CFUUIDCreateString(NULL, uuid);
-        CFRelease(uuid);
+        //CFRelease(uuid);
         [keychainStore save:bundleId data:[UUID dataUsingEncoding:NSUTF8StringEncoding]];
         dispatch_async(dispatch_get_main_queue(), ^{
             [self unregisterDevice:[[UIDevice currentDevice].identifierForVendor UUIDString] response:nil error:nil];
@@ -109,7 +109,7 @@ -(NSString *)serialNumber {
     NSString *serialNumberAsNSString = nil;
     if (serialNumberAsCFString) {
         serialNumberAsNSString = [NSString stringWithString:(__bridge_transfer NSString *)serialNumberAsCFString];
-        CFRelease(serialNumberAsCFString);
+        //CFRelease(serialNumberAsCFString);
     }
     return serialNumberAsNSString;
 }
@@ -201,7 +201,6 @@ -(NSString *)registerDevice {
     [DebLog log:@"MessagingService -> registerDevice (SYNC): %@", deviceRegistration];
     NSArray *args = [NSArray arrayWithObjects:deviceRegistration, nil];
     id result = [invoker invokeSync:SERVER_DEVICE_REGISTRATION_PATH method:METHOD_REGISTER_DEVICE args:args];
-    NSLog(@"Result = %@", result);
     if ([result isKindOfClass:[Fault class]]) {
         return [backendless throwFault:result];
     }
@@ -470,14 +469,19 @@ -(void)pushWithTemplate:(NSString *)templateName response:(void(^)(MessageStatus
 
 -(id)onRegister:(id)response {
     NSArray *resultArray = [self jsonToNSArray:response];
-    [userDefaultsHelper writeToUserDefaults:[NSMutableDictionary dictionaryWithDictionary:[resultArray objectAtIndex:1]] withKey:PUSH_TEMPLATES_USER_DEFAULTS withSuiteName:[userDefaultsHelper getAppGroup]];
+    
+    id template = [resultArray objectAtIndex:1];
+    if ([template isKindOfClass:[NSDictionary class]]) {
+        [userDefaultsHelper writeToUserDefaults:[NSMutableDictionary dictionaryWithDictionary:template] withKey:PUSH_TEMPLATES_USER_DEFAULTS withSuiteName:[userDefaultsHelper getAppGroup]];
+    }
     return resultArray.firstObject;
 }
 
 -(NSArray *)jsonToNSArray:(NSString *)jsonString {
     NSError* error;
     NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-    return [NSJSONSerialization JSONObjectWithData:jsonData options: NSJSONReadingMutableContainers error:&error];
+    NSArray *responseArray = [NSJSONSerialization JSONObjectWithData:jsonData options: NSJSONReadingMutableContainers error:&error];
+    return responseArray;
 }
 
 -(id)onUnregister:(id)response {