Bugfix for Denied permission on Android 11 and later

yasirkula · Apr 25, 2022 · 72fca3d · 72fca3d
1 parent 5f57882
commit 72fca3d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCamera.java b/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCamera.java
@@ -80,8 +80,10 @@ public static int CheckPermission( Context context )
 		if( Build.VERSION.SDK_INT < Build.VERSION_CODES.M )
 			return 1;
 
-		if( context.checkSelfPermission( Manifest.permission.WRITE_EXTERNAL_STORAGE ) != PackageManager.PERMISSION_GRANTED ||
-				context.checkSelfPermission( Manifest.permission.READ_EXTERNAL_STORAGE ) != PackageManager.PERMISSION_GRANTED )
+		if( context.checkSelfPermission( Manifest.permission.READ_EXTERNAL_STORAGE ) != PackageManager.PERMISSION_GRANTED )
+			return 0;
+
+		if( Build.VERSION.SDK_INT < 30 && context.checkSelfPermission( Manifest.permission.WRITE_EXTERNAL_STORAGE ) != PackageManager.PERMISSION_GRANTED )
 			return 0;
 
 		// Credit: https://blog.egorand.me/taking-photos-not-so-simply-how-i-got-bitten-by-action_image_capture/

diff --git a/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCameraPermissionFragment.java b/.github/AAR Source (Android)/java/com/yasirkula/unity/NativeCameraPermissionFragment.java
@@ -57,9 +57,19 @@ public void onCreate( Bundle savedInstanceState )
 		{
 			String[] permissions;
 			if( NativeCameraUtils.IsPermissionDefinedInManifest( getActivity(), Manifest.permission.CAMERA ) )
-				permissions = new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.CAMERA };
+			{
+				if( Build.VERSION.SDK_INT < 30 )
+					permissions = new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.CAMERA };
+				else
+					permissions = new String[] { Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.CAMERA };
+			}
 			else
-				permissions = new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE };
+			{
+				if( Build.VERSION.SDK_INT < 30 )
+					permissions = new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE };
+				else
+					permissions = new String[] { Manifest.permission.READ_EXTERNAL_STORAGE };
+			}
 
 			requestPermissions( permissions, PERMISSIONS_REQUEST_CODE );
 		}

diff --git a/Plugins/NativeCamera/Android/NativeCamera.aar b/Plugins/NativeCamera/Android/NativeCamera.aar
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.nativecamera",
   "displayName": "Native Camera",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "documentationUrl": "https://github.com/yasirkula/UnityNativeCamera",
   "changelogUrl": "https://github.com/yasirkula/UnityNativeCamera/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityNativeCamera/blob/master/LICENSE.txt",