Merge pull request #1415 from OneSignal/add/android_notification_permission_prompting

[Feat] Add Android 13 push permission prompting

Author: nan-li

android/build.gradle

@@ -29,7 +29,7 @@ dependencies {
 
     // api is used instead of implementation so the parent :app project can access any of the OneSignal Java
     //   classes if needed. Such as com.onesignal.NotificationExtenderService
-    api 'com.onesignal:OneSignal:4.7.3'
+    api 'com.onesignal:OneSignal:4.8.1'
 
     testImplementation 'junit:junit:4.12'
 }

android/src/main/java/com/geektime/rnonesignalandroid/RNOneSignal.java

@@ -467,6 +467,20 @@ public void onFailure(OneSignal.OSSMSUpdateError error) {
       });
    }
 
+   @ReactMethod
+   public void promptForPushNotificationsWithUserResponse(final boolean fallbackToSettings, final Callback callback) {
+      final Callback[] callbackArr = new Callback[]{ callback };
+      OneSignal.promptForPushNotifications(fallbackToSettings, new OneSignal.PromptForPushNotificationPermissionResponseHandler() {
+         @Override
+         public void response(boolean accepted) {
+            if (callbackArr[0] != null) {
+               callbackArr[0].invoke(accepted);
+               callbackArr[0] = null;
+            }
+         }
+      });
+   }
+
    @ReactMethod
    public void promptLocation() {
       OneSignal.promptLocation();

examples/RNOneSignalTS/android/app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
+        android:exported="true"
         android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />

examples/RNOneSignalTS/android/build.gradle

@@ -4,8 +4,8 @@ buildscript {
     ext {
         buildToolsVersion = "29.0.2"
         minSdkVersion = 21
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        compileSdkVersion = 33
+        targetSdkVersion = 33
     }
     repositories {
         google()

examples/RNOneSignalTS/src/OSButtons.tsx

@@ -72,7 +72,7 @@ class OSButtons extends React.Component<Props, State> {
             color,
             () => {
                 loggingFunction("Prompting for push with user response...");
-                OneSignal.promptForPushNotificationsWithUserResponse(response => {
+                OneSignal.promptForPushNotificationsWithUserResponse(true, response => {
                     loggingFunction(`User response: ${response}`);
                 });
             }
@@ -115,13 +115,8 @@ class OSButtons extends React.Component<Props, State> {
 
         elements.push(subscribedButton,
             unsubscribeWhenNotificationsAreDisabledButton,
-            registerForProvisionalAuthorization,
+            registerForProvisionalAuthorization, promptForPush,
             locationShared, setLocationShared, promptLocationButton);
-
-        if (Platform.OS === 'ios') {
-            elements.push(promptForPush);
-        }
-
         return elements;
     }
 

examples/RNOneSignalTS/src/OSDemo.tsx

@@ -38,9 +38,6 @@ class OSDemo extends React.Component<Props, State> {
         OneSignal.setAppId("ce8572ae-ff57-4e77-a265-5c91f00ecc4c");
         OneSignal.setLogLevel(6, 0);
         OneSignal.setRequiresUserPrivacyConsent(this.state.requiresPrivacyConsent);
-        OneSignal.promptForPushNotificationsWithUserResponse(response => {
-            this.OSLog("Prompt response:", response);
-        });
 
         /* O N E S I G N A L  H A N D L E R S */
         OneSignal.setNotificationWillShowInForegroundHandler(notifReceivedEvent => {

ios/RCTOneSignal/RCTOneSignalEventEmitter.m

@@ -194,12 +194,6 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     [OneSignal setAppId:newAppId];
 }
 
-RCT_EXPORT_METHOD(promptForPushNotificationPermissions:(RCTResponseSenderBlock)callback) {
-    [OneSignal promptForPushNotificationsWithUserResponse:^(BOOL accepted) {
-        callback(@[@(accepted)]);
-    }];
-}
-
 RCT_EXPORT_METHOD(requestPermissions:(NSDictionary *)permissions) {
     if (RCTRunningInAppExtension()) {
         return;
@@ -326,11 +320,11 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     }];
 }
 
-RCT_EXPORT_METHOD(promptForPushNotificationsWithUserResponse:(RCTResponseSenderBlock)callback) {
+RCT_EXPORT_METHOD(promptForPushNotificationsWithUserResponse:(BOOL)fallbackToSettings withResponse:(RCTResponseSenderBlock)callback) {
     [OneSignal promptForPushNotificationsWithUserResponse:^(BOOL accepted) {
         [OneSignal onesignalLog:ONE_S_LL_VERBOSE message:@"Prompt For Push Notifications Success"];
         callback(@[@(accepted)]);
-    }];
+    } fallbackToSettings:fallbackToSettings];
 }
 
 RCT_EXPORT_METHOD(registerForProvisionalAuthorization:(RCTResponseSenderBlock)callback) {

src/index.ts

@@ -170,19 +170,36 @@ export default class OneSignal {
     /* R E G I S T R A T I O N  E T C */
 
     /**
-     * Prompts the iOS user for push notifications.
+     * Prompts the user for push notifications permission in iOS and Android 13+.
+     * Use the fallbackToSettings parameter to prompt to open the settings app if a user has already declined push permissions.
+     *
+     * Call with promptForPushNotificationsWithUserResponse(fallbackToSettings?, handler?)
+     *
+     * Recommended: Do not use and instead follow: https://documentation.onesignal.com/docs/ios-push-opt-in-prompt.
+     * @param  {boolean} fallbackToSettings
      * @param  {(response:boolean) => void} handler
      * @returns void
      */
-    static promptForPushNotificationsWithUserResponse(handler: (response: boolean) => void): void {
+    static promptForPushNotificationsWithUserResponse(fallbackToSettingsOrHandler?: boolean | ((response: boolean) => void), handler?: (response: boolean) => void): void {
         if (!isNativeModuleLoaded(RNOneSignal)) return;
 
-        if (Platform.OS === 'ios') {
-            isValidCallback(handler);
-            RNOneSignal.promptForPushNotificationsWithUserResponse(handler);
-        } else {
-            console.log("promptForPushNotificationsWithUserResponse: this function is not supported on Android");
+        let fallbackToSettings = false;
+
+        if (typeof fallbackToSettingsOrHandler === "function") {
+            // Method was called like promptForPushNotificationsWithUserResponse(handler: function)
+            handler = fallbackToSettingsOrHandler;
         }
+        else if (typeof fallbackToSettingsOrHandler === "boolean") {
+            // Method was called like promptForPushNotificationsWithUserResponse(fallbackToSettings: boolean, handler?: function)
+            fallbackToSettings = fallbackToSettingsOrHandler;
+        }
+        // Else method was called like promptForPushNotificationsWithUserResponse(), no need to modify
+
+        if (!handler && Platform.OS === 'ios') {
+            handler = function(){};
+        }
+
+        RNOneSignal.promptForPushNotificationsWithUserResponse(fallbackToSettings, handler);
     }
 
     /**