Push notifications: Avoid any automatic deactivation

#3017
element-hq · Apr 1, 2020 · 4cc5a44 · 4cc5a44
1 parent 7bae95a
commit 4cc5a44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,7 @@ Changes in 0.10.5 (TBD)
 Bug fix:
  * Fix error when joining some public rooms, thanks to @chrismoos (PR #2888).
  * Fix crash due to malformed widget (#2997).
+ * Push notifications: Avoid any automatic deactivation (vector-im/riot-ios#3017).
 
 Changes in 0.10.4 (2019-12-11)
 ===============================================

diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
@@ -2069,9 +2069,13 @@ - (void)clearPushNotificationToken
 {
     NSLog(@"[AppDelegate][Push] clearPushNotificationToken: Clear existing token");
 
+    // XXX: The following code has been commented to avoid automatic deactivation of push notifications
+    // There may be a race condition here where the clear happens after the update of the new push token.
+    // We have no evidence of this. This is a safety measure.
+
     // Clear existing token
-    MXKAccountManager* accountManager = [MXKAccountManager sharedManager];
-    [accountManager setPushDeviceToken:nil withPushOptions:nil];
+    //MXKAccountManager* accountManager = [MXKAccountManager sharedManager];
+    //[accountManager setPushDeviceToken:nil withPushOptions:nil];
 }
 
 // Remove delivred notifications for a given room id except call notifications