stream-chat-react-native 5.22.0-beta.5 → 5.22.0-beta.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native",
   "description": "The official React Native SDK for Stream Chat, a service for building chat applications",
-  "version": "5.22.0-beta.5",
+  "version": "5.22.0-beta.6",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -11,7 +11,7 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "es6-symbol": "^3.1.3",
-    "stream-chat-react-native-core": "5.22.0-beta.5"
+    "stream-chat-react-native-core": "5.22.0-beta.6"
   },
   "peerDependencies": {
     "@react-native-camera-roll/camera-roll": ">=5.0.0",

package/src/handlers/takePhoto.ts

@@ -1,8 +1,6 @@
-import { AppState, Image, Linking, PermissionsAndroid, Platform } from 'react-native';
+import { AppState, Image, PermissionsAndroid, Platform } from 'react-native';
 import ImagePicker from 'react-native-image-crop-picker';
 
-let hadDeniedAndroidPermission = false;
-
 export const takePhoto = async ({ compressImageQuality = Platform.OS === 'ios' ? 0.8 : 1 }) => {
   if (Platform.OS === 'android') {
     const cameraPermissions = await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.CAMERA);
@@ -11,13 +9,9 @@ export const takePhoto = async ({ compressImageQuality = Platform.OS === 'ios' ?
         PermissionsAndroid.PERMISSIONS.CAMERA,
       );
       if (androidPermissionStatus === PermissionsAndroid.RESULTS.DENIED) {
-        hadDeniedAndroidPermission = true;
         return { cancelled: true };
       } else if (androidPermissionStatus === PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN) {
-        if (!hadDeniedAndroidPermission) {
-          Linking.openSettings();
-        }
-        return { cancelled: true };
+        return { askToOpenSettings: true, cancelled: true };
       }
     }
   }
@@ -62,9 +56,15 @@ export const takePhoto = async ({ compressImageQuality = Platform.OS === 'ios' ?
       };
     }
   } catch (e: unknown) {
-    // on iOS: if it was in inactive state, then the user had just denied the permissions
-    if (Platform.OS === 'ios' && AppState.currentState === 'active') {
-      await Linking.openSettings();
+    if (e instanceof Error) {
+      // on iOS: if it was in inactive state, then the user had just denied the permissions
+      if (Platform.OS === 'ios' && AppState.currentState === 'active') {
+        const cameraPermissionDeniedMsg = 'User did not grant camera permission.';
+        // Open settings when the user did not allow camera permissions
+        if (e.message === cameraPermissionDeniedMsg) {
+          return { askToOpenSettings: true, cancelled: true };
+        }
+      }
     }
   }