Merge pull request #212 from olgadanylova/master

Push templates fixed to work correctly when adding new button options

Author: Olga Danylova

SDK/backendlessAPI/Classes/Messaging/BackendlessPushHelper.m

@@ -49,27 +49,22 @@ -(void)processMutableContent:(UNNotificationRequest *_Nonnull)request withConten
     }
 
     UNMutableNotificationContent *bestAttemptContent = [request.content mutableCopy];
-    if ([request.content.userInfo valueForKey:@"attachment-url"]) {
-        NSString *urlString = [request.content.userInfo valueForKey:@"attachment-url"];
-        NSURL *fileUrl = [NSURL URLWithString:urlString];
-        [[[NSURLSession sharedSession] downloadTaskWithURL:fileUrl
-                                         completionHandler:^(NSURL *location, NSURLResponse *response, NSError *error) {
-                                             if (location) {
-                                                 NSString *tmpDirectory = NSTemporaryDirectory();
-                                                 NSString *tmpFile = [[@"file://" stringByAppendingString:tmpDirectory] stringByAppendingString:fileUrl.lastPathComponent];
-                                                 NSURL *tmpUrl = [NSURL URLWithString:tmpFile];
-                                                 BOOL success = [[NSFileManager defaultManager] moveItemAtURL:location toURL:tmpUrl error:nil];
-                                                 UNNotificationAttachment *attachment = [UNNotificationAttachment attachmentWithIdentifier:@"" URL:tmpUrl options:nil error:nil];
-                                                 if (attachment) {
-                                                     bestAttemptContent.attachments = @[attachment];
-                                                 }
+    NSString *urlString = [request.content.userInfo valueForKey:@"attachment-url"];
+    NSURL *fileUrl = [NSURL URLWithString:urlString];
+    [[[NSURLSession sharedSession] downloadTaskWithURL:fileUrl
+                                     completionHandler:^(NSURL *location, NSURLResponse *response, NSError *error) {
+                                         if (location) {
+                                             NSString *tmpDirectory = NSTemporaryDirectory();
+                                             NSString *tmpFile = [[@"file://" stringByAppendingString:tmpDirectory] stringByAppendingString:fileUrl.lastPathComponent];
+                                             NSURL *tmpUrl = [NSURL URLWithString:tmpFile];
+                                             BOOL success = [[NSFileManager defaultManager] moveItemAtURL:location toURL:tmpUrl error:nil];
+                                             UNNotificationAttachment *attachment = [UNNotificationAttachment attachmentWithIdentifier:@"" URL:tmpUrl options:nil error:nil];
+                                             if (attachment) {
+                                                 bestAttemptContent.attachments = @[attachment];
                                              }
-                                             contentHandler(bestAttemptContent);
-                                         }] resume];
-    }
-    else {
-        contentHandler(bestAttemptContent);
-    }
+                                         }
+                                         contentHandler(bestAttemptContent);
+                                     }] resume];
 }
 
 -(UNNotificationRequest *)prepareRequestWithIosImmediatePush:(UNNotificationRequest *)request {
@@ -100,7 +95,7 @@ -(UNNotificationRequest *)createRequestFromTemplate:(NSDictionary *)iosPushTempl
     NSNumber *contentAvailable = [iosPushTemplate valueForKey:@"contentAvailable"];
     NSInteger contentAvailableInt = [contentAvailable integerValue];
     if (contentAvailableInt == 1) {
-
+        
     }
     else {
         content.body = [[[request.content.userInfo valueForKey:@"aps"] valueForKey:@"alert"] valueForKey:@"body"];
@@ -134,6 +129,7 @@ -(UNNotificationRequest *)createRequestFromTemplate:(NSDictionary *)iosPushTempl
             [userInfo setObject:urlString forKey:@"attachment-url"];
             content.userInfo = userInfo;
         }
+        
         NSArray *actionsArray = [iosPushTemplate valueForKey:@"actions"];
         content.categoryIdentifier = [self setActions:actionsArray];
     }
@@ -150,7 +146,6 @@ -(UNNotificationRequest *)createRequestFromTemplate:(NSDictionary *)iosPushTempl
 
 -(NSString *)setActions:(NSArray *)actions {
     NSMutableArray *categoryActions = [NSMutableArray new];
-    
     for (NSDictionary *action in actions) {
         NSString *actionId = [action valueForKey:@"id"];
         NSString *actionTitle = [action valueForKey:@"title"];
@@ -160,7 +155,8 @@ -(NSString *)setActions:(NSArray *)actions {
     }
     NSString *categoryId = @"buttonActionsTemplate";
     UNNotificationCategory *category = [UNNotificationCategory categoryWithIdentifier:categoryId actions:categoryActions intentIdentifiers:@[] options:UNNotificationCategoryOptionNone];
-    [UNUserNotificationCenter.currentNotificationCenter setNotificationCategories:[NSSet setWithObject:category]];
+    [[UNUserNotificationCenter currentNotificationCenter] setNotificationCategories:[NSSet setWithObject:category]];
+    
     return categoryId;
 }
 

SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-device.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-fat.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-mac.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-simulator.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-tv-device.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-tv-simulator.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-watch-device.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-watch-simulator.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/bkndlss-device.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"