diff -r 24903d5c696d -r fed715edc3ee project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java Mon Nov 28 16:19:27 2011 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java Mon Nov 28 16:20:48 2011 +0100 @@ -19,11 +19,12 @@ package org.hedgewars.hedgeroid; import org.hedgewars.hedgeroid.Downloader.DownloadAssets; -import org.hedgewars.hedgeroid.Downloader.DownloadFragment; import org.hedgewars.hedgeroid.Downloader.DownloadListActivity; -import org.hedgewars.hedgeroid.Downloader.DownloadService; +import android.app.AlertDialog; +import android.app.Dialog; import android.app.ProgressDialog; +import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.preference.PreferenceManager; @@ -48,15 +49,34 @@ downloader.setOnClickListener(downloadClicker); startGame.setOnClickListener(startGameClicker); - boolean assetsCopied = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("assetscopied", false); + + String cacheDir = Utils.getCachePath(this); + if(cacheDir == null){ + showDialog(0); + }else{ + boolean assetsCopied = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("assetscopied", false); - if(!assetsCopied){ - DownloadAssets assetsAsyncTask = new DownloadAssets(this); - assetsDialog = ProgressDialog.show(this, "Please wait a moment", "Moving assets..."); - assetsAsyncTask.execute((Object[])null); + if(!assetsCopied){ + DownloadAssets assetsAsyncTask = new DownloadAssets(this); + assetsDialog = ProgressDialog.show(this, "Please wait a moment", "Moving assets..."); + assetsAsyncTask.execute((Object[])null); + } } } + public Dialog onCreateDialog(int id, Bundle args){ + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.sdcard_not_mounted_title); + builder.setMessage(R.string.sdcard_not_mounted); + builder.setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener(){ + public void onClick(DialogInterface dialog, int which) { + finish(); + } + }); + + return builder.create(); + } + public void onAssetsDownloaded(boolean result){ if(result){ PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("assetscopied", true).commit();