Bugfix for Denied permission on Android 11 and later

yasirkula · yasirkula · commit bb487817ad46 · 2022-04-25T09:34:12.000+03:00
diff --git a/.github/AAR Source (Android)/java/com/yasirkula/unity/FileBrowser.java b/.github/AAR Source (Android)/java/com/yasirkula/unity/FileBrowser.java
@@ -152,11 +152,13 @@ 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 )
-			return 1;
+		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;
 
-		return 0;
+		return 1;
 	}
 
 	// Credit: https://github.com/Over17/UnityAndroidPermissions/blob/0dca33e40628f1f279decb67d901fd444b409cd7/src/UnityAndroidPermissions/src/main/java/com/unity3d/plugin/UnityAndroidPermissions.java
diff --git a/.github/AAR Source (Android)/java/com/yasirkula/unity/FileBrowserPermissionFragment.java b/.github/AAR Source (Android)/java/com/yasirkula/unity/FileBrowserPermissionFragment.java
@@ -55,9 +55,10 @@ public void onCreate( Bundle savedInstanceState )
 			getFragmentManager().beginTransaction().remove( this ).commit();
 		else
 		{
-			requestPermissions( new String[]
-				{ Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE },
-				PERMISSIONS_REQUEST_CODE );
+			if( Build.VERSION.SDK_INT < 30 )
+				requestPermissions( new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE }, PERMISSIONS_REQUEST_CODE );
+			else
+				requestPermissions( new String[] { Manifest.permission.READ_EXTERNAL_STORAGE }, PERMISSIONS_REQUEST_CODE );
 		}
 	}
 
diff --git a/Plugins/SimpleFileBrowser/Android/SimpleFileBrowser.aar b/Plugins/SimpleFileBrowser/Android/SimpleFileBrowser.aar
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.simplefilebrowser",
   "displayName": "Simple File Browser",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "documentationUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser",
   "changelogUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/releases",
   "licensesUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/blob/master/LICENSE.txt",

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,10 @@ public void onCreate( Bundle savedInstanceState )`
`55`	`55`	`getFragmentManager().beginTransaction().remove( this ).commit();`
`56`	`56`	`else`
`57`	`57`	`{`
`58`		`- requestPermissions( new String[]`
`59`		`- { Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE },`
`60`		`- PERMISSIONS_REQUEST_CODE );`
	`58`	`+ if( Build.VERSION.SDK_INT < 30 )`
	`59`	`+ requestPermissions( new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE }, PERMISSIONS_REQUEST_CODE );`
	`60`	`+ else`
	`61`	`+ requestPermissions( new String[] { Manifest.permission.READ_EXTERNAL_STORAGE }, PERMISSIONS_REQUEST_CODE );`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.yasirkula.simplefilebrowser",`
`3`	`3`	`"displayName": "Simple File Browser",`
`4`		`- "version": "1.5.3",`
	`4`	`+ "version": "1.5.4",`
`5`	`5`	`"documentationUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser",`
`6`	`6`	`"changelogUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/releases",`
`7`	`7`	`"licensesUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/blob/master/LICENSE.txt",`