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

SDL: fixed .obb file mounting

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-05-20 23:27:53 +03:00
parent b9dfad3516
commit 11c23767fb
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
project/java/DataDownloader.java
View File

@@ -325,6 +325,7 @@ 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 || url.indexOf("mnt:") == 0 ) // APK expansion file provided by Google Play if( url.indexOf("obb:") == 0 || url.indexOf("mnt:") == 0 ) // APK expansion file provided by Google Play
{ {
boolean tmpMountObb = ( url.indexOf("mnt:") == 0 );
url = getObbFilePath(url); url = getObbFilePath(url);
InputStream stream1 = null; InputStream stream1 = null;
@@ -334,10 +335,9 @@ class DataDownloader extends Thread
stream1.close(); stream1.close();
Log.i("SDL", "Fetching file from expansion: " + url); Log.i("SDL", "Fetching file from expansion: " + url);
FileInExpansion = true; FileInExpansion = true;
if( url.indexOf("mnt:") == 0 ) MountObb = tmpMountObb;
MountObb = true;
break; break;
} catch( Exception ee ) { } catch( IOException ee ) {
Log.i("SDL", "Failed to open file, requesting storage read permission: " + url); 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) if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
@@ -352,6 +352,10 @@ class DataDownloader extends Thread
} }
} }
} }
} catch( Exception eee ) {
Log.i("SDL", "Failed to open file: " + url);
downloadUrlIndex++;
continue;
} }
try { try {
@@ -360,10 +364,9 @@ class DataDownloader extends Thread
stream1.close(); stream1.close();
Log.i("SDL", "Fetching file from expansion: " + url); Log.i("SDL", "Fetching file from expansion: " + url);
FileInExpansion = true; FileInExpansion = true;
if( url.indexOf("mnt:") == 0 ) MountObb = tmpMountObb;
MountObb = true;
break; break;
} catch( Exception e ) { } catch( Exception eee ) {
Log.i("SDL", "Failed to open file: " + url); Log.i("SDL", "Failed to open file: " + url);
downloadUrlIndex++; downloadUrlIndex++;
continue; continue;
@@ -434,6 +437,7 @@ class DataDownloader extends Thread
if( MountObb ) if( MountObb )
{ {
Log.i("SDL", "Mounting OBB file: " + url);
StorageManager sm = (StorageManager) Parent.getSystemService(Context.STORAGE_SERVICE); StorageManager sm = (StorageManager) Parent.getSystemService(Context.STORAGE_SERVICE);
if( !sm.mountObb(url, null, new OnObbStateChangeListener() if( !sm.mountObb(url, null, new OnObbStateChangeListener()
{ {
@@ -845,6 +849,7 @@ class DataDownloader extends Thread
private String getObbFilePath(final String url) private String getObbFilePath(final String url)
{ {
// "obb:" or "mnt:" - same length
return Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/obb/" + return Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/obb/" +
Parent.getPackageName() + "/" + url.substring("obb:".length()) + "." + Parent.getPackageName() + ".obb"; Parent.getPackageName() + "/" + url.substring("obb:".length()) + "." + Parent.getPackageName() + ".obb";
} }