Tiny fix to data downloader
This commit is contained in:
@@ -292,8 +292,22 @@ 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("http://") == -1 && url.indexOf("https://") == -1 ) // File inside assets
|
if( url.indexOf("http://") == -1 && url.indexOf("https://") == -1 ) // File inside assets
|
||||||
{
|
{
|
||||||
System.out.println("Fetching file from assets: " + url);
|
InputStream stream1 = null;
|
||||||
|
try {
|
||||||
|
stream1 = Parent.getAssets().open(url);
|
||||||
|
stream1.close();
|
||||||
|
} catch( Exception e ) {
|
||||||
|
try {
|
||||||
|
stream1 = Parent.getAssets().open(url + "00");
|
||||||
|
stream1.close();
|
||||||
|
} catch( Exception ee ) {
|
||||||
|
System.out.println("Failed to open file in assets: " + url);
|
||||||
|
downloadUrlIndex++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
FileInAssets = true;
|
FileInAssets = true;
|
||||||
|
System.out.println("Fetching file from assets: " + url);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Submodule project/jni/application/commandergenius/commandergenius updated: d1b8a7ae03...023025901a
@@ -34,8 +34,8 @@ StartupMenuButtonTimeout=3000
|
|||||||
HiddenMenuOptions='OptionalDownloadConfig'
|
HiddenMenuOptions='OptionalDownloadConfig'
|
||||||
FirstStartMenuOptions=''
|
FirstStartMenuOptions=''
|
||||||
MultiABI=n
|
MultiABI=n
|
||||||
AppVersionCode=12219
|
AppVersionCode=12220
|
||||||
AppVersionName="1.2.2.19"
|
AppVersionName="1.2.2.20"
|
||||||
ResetSdlConfigForThisVersion=n
|
ResetSdlConfigForThisVersion=n
|
||||||
DeleteFilesOnUpgrade="%"
|
DeleteFilesOnUpgrade="%"
|
||||||
CompiledLibraries="jpeg png freetype timidity lzma lzo2"
|
CompiledLibraries="jpeg png freetype timidity lzma lzo2"
|
||||||
|
|||||||
Reference in New Issue
Block a user