Merge pull request #1071 from OneSignal/fix/permission-change-event-s…

…tops-firing [Fix] Notification permission change event stop firing
OneSignal · Aug 1, 2023 · 092d2bc · 092d2bc
2 parents 4df9146 + 7a243f4
commit 092d2bc
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/utils/PermissionUtils.ts b/src/utils/PermissionUtils.ts
@@ -14,8 +14,17 @@ export class PermissionUtils {
     if (PermissionUtils.executing) {
       return;
     }
+
     PermissionUtils.executing = true;
+    try {
+      await PermissionUtils.privateTriggerNotificationPermissionChanged(updateIfIdentical);
+    }
+    finally {
+      PermissionUtils.executing = false;
+    }
+  }
 
+  private static async privateTriggerNotificationPermissionChanged(updateIfIdentical: boolean) {
     const newPermission = await OneSignal.privateGetNotificationPermission();
     const previousPermission = await Database.get('Options', 'notificationPermission');
 
@@ -26,6 +35,5 @@ export class PermissionUtils {
 
     await Database.put('Options', { key: 'notificationPermission', value: newPermission });
     Event.trigger(OneSignal.EVENTS.NATIVE_PROMPT_PERMISSIONCHANGED, { to: newPermission });
-    PermissionUtils.executing = false;
   }
 }