diff --git a/project/java/DataDownloader.java b/project/java/DataDownloader.java index f4e9e4c7c..282edf7d8 100644 --- a/project/java/DataDownloader.java +++ b/project/java/DataDownloader.java @@ -214,7 +214,6 @@ class DataDownloader extends Thread downloadFiles[i].contains("") && ! DownloadDataFile(downloadFiles[i].replace("", android.os.Build.CPU_ABI2), DOWNLOAD_FLAG_FILENAME + String.valueOf(i) + ".flag", count+1, total, i) ) ) { - DownloadFailed = true; if (!Parent.getFilesDir().getAbsolutePath().equals(Globals.DataDir)) { Globals.DataDir = Parent.getFilesDir().getAbsolutePath(); @@ -876,7 +875,6 @@ class DataDownloader extends Thread public StatusWriter Status; public boolean DownloadComplete = false; - public boolean DownloadFailed = false; public boolean DownloadCanBeResumed = false; private MainActivity Parent; private String outFilesDir = null; diff --git a/project/javaSDL2/MainActivity.java b/project/javaSDL2/MainActivity.java index 4acbca7f6..3d5a875a4 100644 --- a/project/javaSDL2/MainActivity.java +++ b/project/javaSDL2/MainActivity.java @@ -96,6 +96,23 @@ public class MainActivity extends org.libsdl.app.SDLActivity { } public void downloadFinishedInitSDL() { + if (!this.dataDownloader.downloadCompete) + { + Log.i("SDL", "Data download failed!"); + AlertDialog.Builder dlgAlert = new AlertDialog.Builder(this); + dlgAlert.setMessage(res.getString(R.string.error_dl_from, Globals.DataDownloadUrl)); + dlgAlert.setTitle("SDL Error"); + dlgAlert.setPositiveButton("Exit", + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog,int id) { + System.exit(0); + } + }); + dlgAlert.setCancelable(false); + dlgAlert.create().show(); + return; + } Log.i("SDL", "Data download finished, starting native thread"); this.dataDownloader = null; if (this.nativeThreadResumeCaptured)