Merge pull request #14847 from unknownbrackets/ui-background

Android: Fix UI background on scoped storage
hrydgard · Sep 13, 2021 · 3829ca0 · 3829ca0
2 parents 98a0d71 + dab1a3a
commit 3829ca0
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -1120,13 +1120,20 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		if (requestCode == RESULT_LOAD_IMAGE) {
 			Uri selectedImage = data.getData();
 			if (selectedImage != null) {
-				String[] filePathColumn = {MediaStore.Images.Media.DATA};
-				Cursor cursor = getContentResolver().query(selectedImage, filePathColumn, null, null, null);
-				cursor.moveToFirst();
-				int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
-				String picturePath = cursor.getString(columnIndex);
-				cursor.close();
-				NativeApp.sendMessage("bgImage_updated", picturePath);
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+					NativeApp.sendMessage("bgImage_updated", selectedImage.toString());
+				} else {
+					String[] filePathColumn = {MediaStore.Images.Media.DATA};
+					Cursor cursor = getContentResolver().query(selectedImage, filePathColumn, null, null, null);
+					if (cursor != null) {
+						cursor.moveToFirst();
+						int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
+						String picturePath = cursor.getString(columnIndex);
+						cursor.close();
+
+						NativeApp.sendMessage("bgImage_updated", picturePath);
+					}
+				}
 			}
 		} else if (requestCode == RESULT_OPEN_DOCUMENT) {
 			Uri selectedFile = data.getData();