Merge pull request #2582 from vector-im/riot_2348

Push: Update code to follow API break
element-hq · Jul 16, 2019 · f0e099f · f0e099f
2 parents cf3b0b3 + 8ecf5e7
commit f0e099f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
@@ -2742,7 +2742,7 @@ - (void)initMatrixSessions
             if (isPushRegistered)
             {
                 // Enable push notifications by default on new added account
-                account.enablePushKitNotifications = YES;
+                [account enablePushKitNotifications:YES success:nil failure:nil];
             }
             else
             {

diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
@@ -2874,7 +2874,11 @@ - (void)togglePushNotifications:(id)sender
 
         if (accountManager.pushDeviceToken)
         {
-            [account setEnablePushKitNotifications:!account.isPushKitNotificationActive];
+            [account enablePushKitNotifications:!account.isPushKitNotificationActive success:^{
+                [self stopActivityIndicator];
+            } failure:^(NSError *error) {
+                [self stopActivityIndicator];
+            }];
         }
         else
         {
@@ -2887,7 +2891,11 @@ - (void)togglePushNotifications:(id)sender
                 }
                 else
                 {
-                    [account setEnablePushKitNotifications:YES];
+                    [account enablePushKitNotifications:YES success:^{
+                        [self stopActivityIndicator];
+                    } failure:^(NSError *error) {
+                        [self stopActivityIndicator];
+                    }];
                 }
             }];
         }