Fixed native reflection warnings in #84

yasirkula · Aug 17, 2023 · 95a17c7 · 95a17c7
1 parent db6c74e
commit 95a17c7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.github/AAR Source (Android)/java/com/yasirkula/unity/FileBrowser.java b/.github/AAR Source (Android)/java/com/yasirkula/unity/FileBrowser.java
@@ -108,13 +108,21 @@ public static String GetExternalDrives( Context context )
 		}
 
 		// This is the only working method on some Android 11+ devices (when Storage Access Framework isn't used)
-		if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N )
+		if( android.os.Build.VERSION.SDK_INT >= 30 )
+		{
+			for( StorageVolume volume : ( (StorageManager) context.getSystemService( Context.STORAGE_SERVICE ) ).getStorageVolumes() )
+			{
+				File volumeDirectory = volume.getDirectory();
+				if( volumeDirectory != null )
+					potentialDrives.add( volumeDirectory.toString() );
+			}
+		}
+		else if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N )
 		{
 			try
 			{
 				Method getPath = StorageVolume.class.getMethod( "getPath" );
-				StorageManager storageManager = (StorageManager) context.getSystemService( Context.STORAGE_SERVICE );
-				for( StorageVolume volume : storageManager.getStorageVolumes() )
+				for( StorageVolume volume : ( (StorageManager) context.getSystemService( Context.STORAGE_SERVICE ) ).getStorageVolumes() )
 					potentialDrives.add( (String) getPath.invoke( volume ) );
 			}
 			catch( Exception e )

diff --git a/Plugins/SimpleFileBrowser/Android/SimpleFileBrowser.aar b/Plugins/SimpleFileBrowser/Android/SimpleFileBrowser.aar
diff --git a/Plugins/SimpleFileBrowser/README.txt b/Plugins/SimpleFileBrowser/README.txt
@@ -1,4 +1,4 @@
-= Simple File Browser (v1.6.0) =
+= Simple File Browser (v1.6.1) =
 
 Online documentation & example code available at: https://github.com/yasirkula/UnitySimpleFileBrowser
 E-mail: [email protected]

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.simplefilebrowser",
   "displayName": "Simple File Browser",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "documentationUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser",
   "changelogUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/releases",
   "licensesUrl": "https://github.com/yasirkula/UnitySimpleFileBrowser/blob/master/LICENSE.txt",