Merge pull request #72 from JanC/develop

Show an error when the connection to apns fails

Author: blommegard

Knuff/APNSViewController.m

@@ -658,12 +658,21 @@ - (void)popoverDidClose:(NSNotification *)notification {
 #pragma mark - SBAPNSDelegate
 
 - (void)APNS:(SBAPNS *)APNS didRecieveStatus:(NSInteger)statusCode reason:(NSString *)reason forID:(NSString *)ID {
-  NSAlert *alert = [NSAlert new];
-  [alert addButtonWithTitle:@"OK"];
-  alert.messageText = @"Error delivering notification";
-  alert.informativeText = [NSString stringWithFormat:@"%ld: %@", (long)statusCode, reason];
-  
-  [alert beginSheetModalForWindow:self.document.windowForSheet completionHandler:nil];
+
+    [self showError:[NSString stringWithFormat:@"%ld: %@", (long)statusCode, reason]];
+}
+
+- (void)APNS:(nonnull SBAPNS *)APNS didFailWithError:(nonnull NSError *)error {
+    [self showError:[NSString stringWithFormat:@"Connection failed: %@", error]];
+}
+
+- (void)showError:(NSString *)errorMessage {
+    NSAlert *alert = [NSAlert new];
+    [alert addButtonWithTitle:@"OK"];
+    alert.messageText = @"Error delivering notification";
+    alert.informativeText = errorMessage;
+
+    [alert beginSheetModalForWindow:self.document.windowForSheet completionHandler:nil];
 }
 
 @end

Knuff/SBAPNS.h

@@ -12,6 +12,7 @@
 
 @protocol SBAPNSDelegate <NSObject>
 - (void)APNS:(nonnull SBAPNS *)APNS didRecieveStatus:(NSInteger)statusCode reason:(nonnull NSString *)reason forID:(nullable NSString *)ID;
+- (void)APNS:(nonnull SBAPNS *)APNS didFailWithError:(nonnull NSError *)error;
 @end
 
 @interface SBAPNS : NSObject

Knuff/SBAPNS.m

@@ -70,6 +70,13 @@ - (void)pushPayload:(nonnull NSDictionary *)payload
   NSURLSessionDataTask *task = [self.session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
     NSHTTPURLResponse *r = (NSHTTPURLResponse *)response;
 
+    if (r == nil && error) {
+        if ([self.delegate respondsToSelector:@selector(APNS:didFailWithError:)]) {
+            [self.delegate APNS:self didFailWithError:error];
+        }
+        return;
+    }
+      
     if (r.statusCode != 200 && data) {
       NSError *error;
       NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];