Merge pull request #239 from olgadanylova/master

fixed device registration for iOS 13
Backendless · Oct 8, 2019 · 9e96826 · 9e96826
2 parents 4c30fc2 + 8bffb51
commit 9e96826
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # RELEASE HISTORY
 
+## 5.5.0 October 8, 2019
+* fixed the device registration for iOS 13 and above
+
 ## 5.4.1 August 19, 2019
 * added the blUserLocale property (two character code) to the BackendlessUser object
 * added methods to UserService:

diff --git a/Pods/Backendless.podspec b/Pods/Backendless.podspec
diff --git a/SDK/Podfile.lock b/SDK/Podfile.lock
@@ -7,14 +7,14 @@ DEPENDENCIES:
   - Socket.IO-Client-Swift
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - Socket.IO-Client-Swift
     - Starscream
 
 SPEC CHECKSUMS:
   Socket.IO-Client-Swift: 7cb44c0ffb86e158cee32d0642d30ec5fdcf8f61
   Starscream: 08172b481e145289c4930cb567230fb55897cfa4
 
-PODFILE CHECKSUM: 675cc991d5f2f8cb6bcd0ce2d67444ed1b8f2a74
+PODFILE CHECKSUM: 5cd4b8ef98be7dc5a7082de9b679e21d33e284c4
 
-COCOAPODS: 1.7.4
+COCOAPODS: 1.8.1
diff --git a/SDK/backendless.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/SDK/backendless.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -4,5 +4,7 @@
 <dict>
 	<key>BuildSystemType</key>
 	<string>Original</string>
+	<key>PreviewsEnabled</key>
+	<false/>
 </dict>
 </plist>
diff --git a/SDK/backendlessAPI/Classes/Messaging/MessagingService.m b/SDK/backendlessAPI/Classes/Messaging/MessagingService.m
@@ -153,8 +153,24 @@ -(DeviceRegistration *)currentDevice {
 }
 
 -(NSString *)deviceTokenAsString:(NSData *)token {
-    NSString *str = [NSString stringWithFormat:@"%@", token];
-    return [[[str stringByReplacingOccurrencesOfString:@" " withString:@""] stringByReplacingOccurrencesOfString:@"<" withString:@""] stringByReplacingOccurrencesOfString:@">" withString:@""];
+    NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
+    NSInteger majorVersion = version.majorVersion;
+    if (majorVersion >= 13) {
+        NSUInteger length = token.length;
+        if (length == 0) {
+            return nil;
+        }
+        const unsigned char *buffer = token.bytes;
+        NSMutableString *hexString  = [NSMutableString stringWithCapacity:(length * 2)];
+        for (int i = 0; i < length; ++i) {
+            [hexString appendFormat:@"%02x", buffer[i]];
+        }
+        return [hexString copy];
+    }
+    else {
+        NSString *str = [NSString stringWithFormat:@"%@", token];
+        return [[[str stringByReplacingOccurrencesOfString:@" " withString:@""] stringByReplacingOccurrencesOfString:@"<" withString:@""] stringByReplacingOccurrencesOfString:@">" withString:@""];
+    }
 }
 
 // Channel

diff --git a/SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj b/SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj
@@ -8677,7 +8677,7 @@
 		F9042AFA15FDD8D300C9381A /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = BACKENDLESS.COM;
 				TargetAttributes = {
 					5A06BCDE20D1109F00E0315F = {

diff --git a/...ackendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-device.xcscheme b/...ackendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-device.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:backendlessAPI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-fat.xcscheme b/SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-fat.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"

diff --git a/SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-mac.xcscheme b/SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:backendlessAPI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/...endlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-simulator.xcscheme b/...endlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-simulator.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:backendlessAPI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/...endlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-tv-device.xcscheme b/...endlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-tv-device.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:backendlessAPI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/...lessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-tv-simulator.xcscheme b/...lessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-tv-simulator.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:backendlessAPI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/...lessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-watch-device.xcscheme b/...lessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-watch-device.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:backendlessAPI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/...sAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-watch-simulator.xcscheme b/...sAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-watch-simulator.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:backendlessAPI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/bkndlss-device.xcscheme b/SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/bkndlss-device.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:backendlessAPI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"