2
0
Эх сурвалжийг харах

Fix possible null pointer exception.

(cherry picked from commit e2bcdad43be4379383ab896fd6fa4f43e6b4f9d6)
ne0fhyk 4 жил өмнө
parent
commit
a9bffd5878

+ 6 - 1
platform/android/java/lib/src/org/godotengine/godot/GodotIO.java

@@ -43,6 +43,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.SparseArray;
@@ -484,7 +485,11 @@ public class GodotIO {
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
 				Log.w(TAG, "Shared storage access is limited on Android 10 and higher.");
 			}
-			return Environment.getExternalStoragePublicDirectory(what).getAbsolutePath();
+			if (TextUtils.isEmpty(what)) {
+				return Environment.getExternalStorageDirectory().getAbsolutePath();
+			} else {
+				return Environment.getExternalStoragePublicDirectory(what).getAbsolutePath();
+			}
 		} else {
 			return activity.getExternalFilesDir(what).getAbsolutePath();
 		}