fix: remove pusher when logout

linagora · Oct 6, 2023 · 06df598 · 06df598
1 parent 01d5be1
commit 06df598
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/pages/settings_dashboard/settings/settings.dart b/lib/pages/settings_dashboard/settings/settings.dart
@@ -79,7 +79,12 @@ class SettingsController extends State<Settings> with ConnectPageMixin {
     final matrix = Matrix.of(context);
     await showFutureLoadingDialog(
       context: context,
-      future: () => matrix.client.logout(),
+      future: () async {
+        if (matrix.backgroundPush != null) {
+          await matrix.backgroundPush!.removeCurrentPusher();
+        }
+        return matrix.client.logout();
+      },
     );
   }
 

diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart
@@ -570,4 +570,11 @@ class BackgroundPush {
       apnChannel.invokeMethod('clearAll');
     }
   }
+
+  Future<void> removeCurrentPusher() async {
+    if (_pushToken == null) return;
+    await setupPusher(
+      oldTokens: {_pushToken},
+    );
+  }
 }