lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 01:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Scoped Storage Support for Android

Browse Source 
Updated permissions for the renderdoccmd app based on which version of
android the app is running on
**WRITE_EXTERNAL_STORAGE for <R
**MANAGE_EXTERNAL_STORAGE for >=R

Updated the Java portion of renderdoccmd to check/request the correct
permission based on android version

Changed the file path for renderdoc files on Android based on the
version of Android the connected device is running
**/sdcard/Android/data/$PACKAGE_NAME for <R
**/sdcard/Android/media/$PACKAGE_NAME for >=R
This commit is contained in:
Omar El Sheikh
2020-07-06 15:54:43 -04:00
committed by Baldur Karlsson
parent efafd0b766
commit c15078b900
6 changed files with 63 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoccmd/android/Loader.java
+31 -10
View File
@@ -2,6 +2,8 @@ package @RENDERDOC_ANDROID_PACKAGE_NAME@;
import android.os.Build;
import android.app.Activity;
import android.view.WindowManager;
import android.os.Environment;
import android.content.Intent;
public class Loader extends android.app.NativeActivity
{
@@ -20,18 +22,37 @@ public class Loader extends android.app.NativeActivity
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
return;
// Popup a dialog if we haven't granted Android storage permissions.
requestPermissions(new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
String[] permission = new String[1];
if (Build.VERSION.SDK_INT < 30 /*Build.VERSION_CODES.R*/) {
permission[0] = android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
// Request is asynchronous, so prevent connection to server until permissions granted.
while(checkSelfPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
!= android.content.pm.PackageManager.PERMISSION_GRANTED)
{
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
break;
requestPermissions(permission, 1);
// Request is asynchronous, so prevent connection to server until permissions granted.
while(checkSelfPermission(permission[0])
!= android.content.pm.PackageManager.PERMISSION_GRANTED)
{
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
break;
}
}
}
else {
permission[0] = "android.permission.MANAGE_EXTERNAL_STORAGE"; // android.Manifest.permission.MANAGE_EXTERNAL_STORAGE;
try {
java.lang.reflect.Method method = Environment.class.getMethod("isExternalStorageManager");
Boolean result = (Boolean)method.invoke(null);
// Popup a dialog if we haven't granted Android storage permissions.
if (!result) {
Intent viewIntent = new Intent( "android.settings.MANAGE_ALL_FILES_ACCESS_PERMISSION" /*android.provider.Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION*/);
startActivity(viewIntent);
}
} catch(Exception e) { }
}
}
}