make the permissions flow 🆒

Author: aisraelov

augmentos_manager/src/logic/PermissionsUtils.tsx

@@ -5,13 +5,9 @@ import { checkAndRequestNotificationAccessSpecialPermission, checkNotificationAc
 export const requestGrantPermissions = async () => {
   // Request permissions on Android
   if (Platform.OS === 'android' && Platform.Version >= 23) {
-    PermissionsAndroid.requestMultiple(getAndroidPermissions()).then(async (result) => {
+    return PermissionsAndroid.requestMultiple(getAndroidPermissions()).then(async (result) => {
       console.log('Permissions granted:', result);
 
-      //if (await checkNotificationPermission() && !(await NotificationService.isNotificationListenerEnabled())) {
-      //  await NotificationService.startNotificationListenerService()
-      //}
-
       const allGranted = Object.values(result).every(
         (value) => value === PermissionsAndroid.RESULTS.GRANTED
       );
@@ -21,21 +17,30 @@ export const requestGrantPermissions = async () => {
         // Optionally handle partial denial here
         await displayPermissionDeniedWarning();
       }
+      return allGranted;
     })
       .catch((error) => {
         console.error('Error requesting permissions:', error);
+        return false;
       });
   }
+  return true;
 };
 
-export const displayPermissionDeniedWarning = async () => {
-  Alert.alert(
-    'Permissions Required',
-    'Some permissions were denied. Please go to Settings and enable all required permissions for the app to function properly.',
-    [
-      { text: 'OK', style: 'default' },
-    ]
-  );
+export const displayPermissionDeniedWarning = () => {
+  return new Promise((resolve) => {
+    Alert.alert(
+      'Permissions Required', 
+      'Some permissions were denied. Please go to Settings and enable all required permissions for the app to function properly.',
+      [
+        { 
+          text: 'OK',
+          style: 'default',
+          onPress: () => resolve(true)
+        },
+      ]
+    );
+  });
 };
 
 export const doesHaveAllPermissions = async () => {
@@ -48,11 +53,8 @@ export const doesHaveAllPermissions = async () => {
       }
     }
 
-    try {
-      await checkAndRequestNotificationAccessSpecialPermission();
-    } catch (error) {
-      console.warn('Notification permission request error:', error);
-    }
+    let notificationPerms = await checkNotificationAccessSpecialPermission();
+    if (!notificationPerms) allGranted = false;
 
     return allGranted;
   } else if (Platform.OS === 'ios') {
@@ -65,6 +67,10 @@ export const doesHaveAllPermissions = async () => {
 export const getAndroidPermissions = (): Permission[] => {
   const list = [];
   if (Platform.OS === 'android') {
+    if (Platform.Version < 29) {
+      list.push(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE);
+    }
+
     if (Platform.Version >= 23) {
       list.push(PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION);
     }
@@ -75,7 +81,14 @@ export const getAndroidPermissions = (): Permission[] => {
     }
     if (Platform.Version >= 33) {
       list.push(PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS);
+    } else {
+      list.push(PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE);
     }
+
+    list.push(PermissionsAndroid.PERMISSIONS.READ_CALENDAR);
+    list.push(PermissionsAndroid.PERMISSIONS.WRITE_CALENDAR);
+    list.push(PermissionsAndroid.PERMISSIONS.RECORD_AUDIO);
+    list.push(PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS);
   }
   return list as Permission[];
 }

augmentos_manager/src/screens/GrantPermissionsScreen.tsx

@@ -14,8 +14,10 @@ import {
   AppState,
 } from 'react-native';
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
-import { displayPermissionDeniedWarning, doesHaveAllPermissions, requestGrantPermissions } from '../logic/PermissionsUtils';
+import { displayPermissionDeniedWarning, doesHaveAllPermissions, requestGrantPermissions as requestGrantBasicPermissions } from '../logic/PermissionsUtils';
 import Button from '../components/Button';
+import { checkNotificationPermission } from '../logic/NotificationServiceUtils';
+import { checkAndRequestNotificationAccessSpecialPermission, checkNotificationAccessSpecialPermission } from "../utils/NotificationServiceUtils";
 
 interface GrantPermissionsScreenProps {
   isDarkTheme: boolean;
@@ -95,10 +97,25 @@ const GrantPermissionsScreen: React.FC<GrantPermissionsScreenProps> = ({
   }, [appState, isMonitoringAppState]);
 
   const triggerGrantPermissions = async () => {
-    await requestGrantPermissions();
-
-    if (!(await doesHaveAllPermissions()))
-      setIsMonitoringAppState(true);
+    let allBasicPermissionsGranted = await requestGrantBasicPermissions();
+    console.log("DID WE GET ALL THE BASIC PERMISSIONS???");
+    console.log(allBasicPermissionsGranted);
+
+    if ((await doesHaveAllPermissions())) {
+      console.log("WE SUPPOSEDLY HAVE ALL THE PERMSSS");
+      navigation.reset({
+        index: 0,
+        routes: [{ name: 'SplashScreen' }],
+      });
+    } else {
+      console.log(" WE NEED MOR PERMS ");
+      let doesHaveSpecialNotificationPermission = await checkNotificationAccessSpecialPermission();
+      if(!doesHaveSpecialNotificationPermission) {
+        console.log("WE NEED MORE NOTIFICATION PERMSS");
+        checkAndRequestNotificationAccessSpecialPermission();
+        setIsMonitoringAppState(true);
+      }
+    }
   }
 
   return (
@@ -121,6 +138,7 @@ const GrantPermissionsScreen: React.FC<GrantPermissionsScreenProps> = ({
             AugmentOS needs permissions to function properly. Please grant access to continue using all features.
           </Text>
           <Button
+          disabled={false}
             onPress={() => { triggerGrantPermissions() }}
             isDarkTheme={isDarkTheme}
           >