Android notification permission issue fix (#114)

* Android notification permission issue fix * pod.lock file reverted * DMAPP-112: project.pbxproj file reverted * DMAPP-112: Extra space added --------- Co-authored-by: Kushdeep Singh <[email protected]>
push-protocol · Oct 16, 2024 · b2c7517 · b2c7517
1 parent 25b56d5
commit b2c7517
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
   <uses-feature android:name="android.hardware.camera.autofocus"/>
   <uses-feature android:name="android.hardware.audio.output"/>
   <uses-feature android:name="android.hardware.microphone"/>
+  <uses-permission android:name="android.permission.POST_NOTIFICATION"/>
   <queries>
     <intent>
       <action android:name="android.intent.action.VIEW"/>

diff --git a/src/navigation/screens/PushNotifyScreen.tsx b/src/navigation/screens/PushNotifyScreen.tsx
@@ -2,6 +2,7 @@ import messaging from '@react-native-firebase/messaging';
 import {useNavigation} from '@react-navigation/native';
 import React from 'react';
 import {Image, StyleSheet, View} from 'react-native';
+import {PermissionsAndroid, Platform} from 'react-native';
 import GLOBALS from 'src/Globals';
 import {ToasterOptions} from 'src/components/indicators/Toaster';
 import OnboardingWrapper from 'src/components/misc/OnboardingWrapper';
@@ -13,15 +14,22 @@ const PushNotifyScreen = () => {
   const {toastRef} = useToaster();
 
   const enableNotifications = async () => {
-    const settings = await messaging().requestPermission();
-    if (settings == messaging.AuthorizationStatus.AUTHORIZED) {
-      loadNextScreen();
-    } else {
-      toastRef.current?.showToast(
-        'Notifications are disabled. \nYou can enable them in your device settings.',
-        '',
-        ToasterOptions.TYPE.GRADIENT_PRIMARY,
+    if (Platform.OS === 'android') {
+      const res = await PermissionsAndroid.request(
+        PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS,
       );
+      if (res == PermissionsAndroid.RESULTS.GRANTED) {
+        loadNextScreen();
+      } else {
+        showToast();
+      }
+    } else {
+      const settings = await messaging().requestPermission();
+      if (settings == messaging.AuthorizationStatus.AUTHORIZED) {
+        loadNextScreen();
+      } else {
+        showToast();
+      }
     }
   };
 
@@ -32,6 +40,14 @@ const PushNotifyScreen = () => {
     navigation.navigate(GLOBALS.SCREENS.GETSTARTED);
   };
 
+  const showToast = () => {
+    toastRef.current?.showToast(
+      'Notifications are disabled. \nYou can enable them in your device settings.',
+      '',
+      ToasterOptions.TYPE.GRADIENT_PRIMARY,
+    );
+  };
+
   return (
     <OnboardingWrapper
       title="Receive notifications for your preferred wallet activity."