Merge pull request #936 from OneSignal/v5_resolve_request_permission

V5 resolve request permission
OneSignal · Nov 9, 2023 · f395403 · f395403
2 parents c5fbb28 + 67d96f6
commit f395403
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/android/com/onesignal/cordova/OneSignalController.java b/src/android/com/onesignal/cordova/OneSignalController.java
@@ -242,10 +242,10 @@ public static boolean requestPermission(CallbackContext callbackContext, JSONArr
 
     OneSignal.getNotifications().requestPermission(fallbackToSettings, Continue.with(r -> {
       if (r.isSuccess()) {
-        if (r.getData()) {
-          Boolean didPermit = r.getData();
-          CallbackHelper.callbackSuccessBoolean(callbackContext, didPermit);
-        }
+        CallbackHelper.callbackSuccessBoolean(callbackContext, r.getData());
+      } else {
+        // coroutine was not successful
+        CallbackHelper.callbackError(callbackContext, r.getThrowable().getMessage());
       }
     }));
     return true;

diff --git a/www/NotificationsNamespace.ts b/www/NotificationsNamespace.ts
@@ -73,6 +73,10 @@ export default class Notifications {
      * @returns {Promise<boolean>}
      */
     requestPermission(fallbackToSettings?: boolean): Promise<boolean> {
+        // if permission already exists, return early as the native call will not resolve
+        if (this.hasPermission()) {
+            return Promise.resolve(true);
+        }
         let fallback = fallbackToSettings ?? false;
 
         return new Promise<boolean>((resolve, reject) => {