Fix registerCallback

ably · Feb 14, 2017 · 08f9d01 · 08f9d01
1 parent 581e76f
commit 08f9d01
Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Source/ARTPush.h b/Source/ARTPush.h
@@ -52,8 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
 #ifdef TARGET_OS_IPHONE
 /// Register a device, including the information necessary to deliver push notifications to it.
 - (void)activate;
-- (void)activate:(ARTDeviceDetails *)deviceDetails;
-- (void)activate:(ARTDeviceDetails *)deviceDetails registerCallback:(nullable ARTUpdateToken* (^)(ARTDeviceDetails * _Nullable, ARTErrorInfo * _Nullable))registerCallback;
+- (void)activateWithRegisterCallback:(void (^)(ARTDeviceDetails * _Nullable, ARTErrorInfo * _Nullable,  void (^ _Nullable)(ARTUpdateToken * _Nullable, ARTErrorInfo * _Nullable)))registerCallback;
 /// Unregister a device.
 - (void)deactivate:(ARTDeviceId *)deviceId;
 - (void)deactivate:(ARTDeviceId *)deviceId deregisterCallback:(nullable void (^)(ARTDeviceId * _Nullable, ARTErrorInfo * _Nullable))deregisterCallback;

diff --git a/Source/ARTPush.m b/Source/ARTPush.m
@@ -81,11 +81,11 @@ - (void)activate {
     [self activate:self.device registerCallback:nil];
 }
 
-- (void)activate:(ARTDeviceDetails *)deviceDetails {
-    [self activate:deviceDetails registerCallback:nil];
+- (void)activateWithRegisterCallback:(void (^)(ARTDeviceDetails *, ARTErrorInfo *, void (^)(ARTUpdateToken *, ARTErrorInfo *)))registerCallback {
+    [self activate:self.device registerCallback:registerCallback];
 }
 
-- (void)activate:(ARTDeviceDetails *)deviceDetails registerCallback:(ARTUpdateToken* (^)(ARTDeviceDetails * _Nullable, ARTErrorInfo * _Nullable))registerCallback {
+- (void)activate:(ARTDeviceDetails *)deviceDetails registerCallback:(void (^)(ARTDeviceDetails *, ARTErrorInfo *, void (^)(ARTUpdateToken *, ARTErrorInfo *)))registerCallback {
     if (self.state == ARTPushStateActivated) {
         return;
     }
@@ -100,7 +100,14 @@ - (void)activate:(ARTDeviceDetails *)deviceDetails registerCallback:(ARTUpdateTo
     }
 
     if (registerCallback) {
-        self.device.updateToken = registerCallback(deviceDetails, nil);
+        registerCallback(deviceDetails, nil, ^(ARTUpdateToken *updateToken, ARTErrorInfo *error) {
+            if (updateToken) {
+                self.device.updateToken = updateToken;
+            }
+            if (error) {
+                [_logger error:@"%@: device registration using a `registerCallback` failed (%@)", NSStringFromClass(self.class), error.localizedDescription];
+            }
+        });
         return;
     }