miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: do not delete .obb file, do not request storage write permission to read .obb file

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-05-19 00:06:09 +03:00
parent 1215590f90
commit c08e0e6db3
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
project/java/DataDownloader.java
View File

@@ -319,21 +319,33 @@ class DataDownloader extends Thread
Status.setText( downloadCount + "/" + downloadTotal + ": " + res.getString(R.string.connecting_to, url) ); Status.setText( downloadCount + "/" + downloadTotal + ": " + res.getString(R.string.connecting_to, url) );
if( url.indexOf("obb:") == 0 ) // APK expansion file provided by Google Play if( url.indexOf("obb:") == 0 ) // APK expansion file provided by Google Play
{ {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) url = getObbFilePath(url);
{ InputStream stream1 = null;
int permissionCheck = Parent.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
if (permissionCheck != PackageManager.PERMISSION_GRANTED && !Parent.writeExternalStoragePermissionDialogAnswered) try {
stream1 = new FileInputStream(url);
stream1.read();
stream1.close();
Log.i("SDL", "Fetching file from expansion: " + url);
FileInExpansion = true;
break;
} catch( Exception ee ) {
Log.i("SDL", "Failed to open file, requesting storage read permission: " + url);
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
{ {
Parent.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0); int permissionCheck = Parent.checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
while( !Parent.writeExternalStoragePermissionDialogAnswered ) if (permissionCheck != PackageManager.PERMISSION_GRANTED && !Parent.readExternalStoragePermissionDialogAnswered)
{ {
try{ Thread.sleep(300); } catch (InterruptedException e) {} Parent.requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 0);
while( !Parent.readExternalStoragePermissionDialogAnswered )
{
try{ Thread.sleep(300); } catch (InterruptedException e) {}
}
} }
} }
} }
url = getObbFilePath(url);
InputStream stream1 = null;
try { try {
stream1 = new FileInputStream(url); stream1 = new FileInputStream(url);
stream1.read(); stream1.read();
@@ -501,15 +513,7 @@ class DataDownloader extends Thread
try { try {
stream.close(); stream.close();
if( FileInExpansion )
{
Writer writer = new OutputStreamWriter(new FileOutputStream(url), "UTF-8");
writer.write("Extracted and truncated\n");
writer.close();
Log.i("SDL", "Truncated file from expansion: " + url);
}
} catch( java.io.IOException e ) { } catch( java.io.IOException e ) {
Log.i("SDL", "Error truncating file from expansion: " + url);
}; };
return true; return true;

6
project/java/MainActivity.java
View File

@@ -1420,6 +1420,11 @@ public class MainActivity extends Activity
{ {
Log.i("SDL", "libSDL: Record audio permission: " + (grantResults[0] == PackageManager.PERMISSION_GRANTED ? "GRANTED" : "DENIED")); Log.i("SDL", "libSDL: Record audio permission: " + (grantResults[0] == PackageManager.PERMISSION_GRANTED ? "GRANTED" : "DENIED"));
} }
if (Manifest.permission.READ_EXTERNAL_STORAGE.equals(permissions[0]))
{
Log.i("SDL", "libSDL: Read external storage permission: " + (grantResults[0] == PackageManager.PERMISSION_GRANTED ? "GRANTED" : "DENIED"));
readExternalStoragePermissionDialogAnswered = true;
}
if (Manifest.permission.WRITE_EXTERNAL_STORAGE.equals(permissions[0])) if (Manifest.permission.WRITE_EXTERNAL_STORAGE.equals(permissions[0]))
{ {
Log.i("SDL", "libSDL: Write external storage permission: " + (grantResults[0] == PackageManager.PERMISSION_GRANTED ? "GRANTED" : "DENIED")); Log.i("SDL", "libSDL: Write external storage permission: " + (grantResults[0] == PackageManager.PERMISSION_GRANTED ? "GRANTED" : "DENIED"));
@@ -1461,6 +1466,7 @@ public class MainActivity extends Activity
public LinkedList<Integer> textInput = new LinkedList<Integer> (); public LinkedList<Integer> textInput = new LinkedList<Integer> ();
public static MainActivity instance = null; public static MainActivity instance = null;
public boolean readExternalStoragePermissionDialogAnswered = false;
public boolean writeExternalStoragePermissionDialogAnswered = false; public boolean writeExternalStoragePermissionDialogAnswered = false;
} }