Merge branch 'develop'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-sightcall",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Cordova SightCall Plugin",
   "cordova": {
     "id": "cordova-plugin-sightcall",

plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-sightcall" version="4.0.2">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-sightcall" version="4.0.3">
     <name>SightCall</name>
     <description>Cordova SightCall Plugin</description>
     <license>MIT</license>

src/ios/AppDelegate+Sightcall.m

@@ -55,11 +55,16 @@ - (AppDelegate *)pluginSwizzledInit
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
 
     NSLog(@"Sightcall - Notifications device token received: %@", deviceToken);
-    NSString * deviceTokenString = [[[[deviceToken description]
-                                      stringByReplacingOccurrencesOfString: @"<" withString: @""]
-                                     stringByReplacingOccurrencesOfString: @">" withString: @""]
-                                    stringByReplacingOccurrencesOfString: @" " withString: @""];
-    [CDVSightCall setNotificationDeviceToken:deviceTokenString];
+    NSUInteger length = deviceToken.length;
+    if (length == 0) {
+        return;
+    }
+    const unsigned char *buffer = deviceToken.bytes;
+    NSMutableString *hexString  = [NSMutableString stringWithCapacity:(length * 2)];
+    for (int i = 0; i < length; ++i) {
+        [hexString appendFormat:@"%02x", buffer[i]];
+    }
+    [CDVSightCall setNotificationDeviceToken:[hexString copy]];
 }
 
 

src/ios/CDVSightCall.h

@@ -11,6 +11,8 @@
 #endif
 @property (nonatomic, copy) NSString *listenerCallbackID;
 
+@property NSString *apnsToken;
+
 - (void)registerListener:(CDVInvokedUrlCommand *)command;
 - (void)demo:(CDVInvokedUrlCommand*)command;
 - (void)enableLogger:(CDVInvokedUrlCommand*)command;

src/ios/CDVSightCall.m

@@ -51,6 +51,9 @@ - (void)pluginInitialize
 
 - (void)initSightcall {
     self.lsUniversal = [[LSUniversal alloc] init];
+    if (self.apnsToken) {
+        [self.lsUniversal.agentHandler setNotificationToken: self.apnsToken];
+    }
     self.lsUniversal.delegate = self;
     [self.lsUniversal setPictureDelegate: self];
     self.lsUniversal.logDelegate = self;
@@ -268,6 +271,8 @@ - (void)generateCallURL:(CDVInvokedUrlCommand*)command
 + (void)setNotificationDeviceToken:(NSString *)token {
     CDVSightCall *plugin = instance;
     if (plugin == NULL) { return; }
+    NSLog(@"Calling setNotificationToken with notification token: %@", token);
+    plugin.apnsToken = token;
     [plugin.lsUniversal.agentHandler setNotificationToken: token];
 }