diff --git a/alienblaster/AppSettings.cfg b/alienblaster/AppSettings.cfg index fd5859f30..0a36625af 100644 --- a/alienblaster/AppSettings.cfg +++ b/alienblaster/AppSettings.cfg @@ -2,7 +2,7 @@ LibSdlVersion=1.3 AppName="Alien Blaster" AppFullName=de.schwardtnet.alienblaster ScreenOrientation=h -AppDataDownloadUrl="http://sites.google.com/site/xpelyax/Home/alienblaster110_data.zip?attredirects=0&d=1" +AppDataDownloadUrl="http://sites.google.com/site/xpelyax/Home/alienblaster110_data.zip?attredirects=0&d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/alienblaster110_data.zip" DownloadToSdcard=n SdlVideoResize=y NeedDepthBuffer=n diff --git a/alienblaster/ChangeAppSettings.sh b/alienblaster/ChangeAppSettings.sh index d2df5aee8..99b999dfc 100755 --- a/alienblaster/ChangeAppSettings.sh +++ b/alienblaster/ChangeAppSettings.sh @@ -28,7 +28,7 @@ if [ -n "$var" ] ; then ScreenOrientation="$var" fi -echo -n "\nSpecify URL to download application data in zip archive ($AppDataDownloadUrl): " +echo -n "\nSpecify URL to download application data in zip archive, you may specify backup URLs delimited by '|'\n($AppDataDownloadUrl):\n" read var if [ -n "$var" ] ; then AppDataDownloadUrl="$var" diff --git a/alienblaster/build.sh b/alienblaster/build.sh index c00ad0e13..9d1d956ed 100755 --- a/alienblaster/build.sh +++ b/alienblaster/build.sh @@ -3,5 +3,5 @@ # Set here your own NDK path if needed export PATH=$PATH:~/src/endless_space/android-ndk-r4 -cd project && ndk-build V=1 && ant debug && cd bin && adb install -r DemoActivity-debug.apk +cd project && nice -n5 ndk-build -j2 V=1 && ant debug && cd bin && adb install -r DemoActivity-debug.apk diff --git a/alienblaster/project/src/DataDownloader.java b/alienblaster/project/src/DataDownloader.java index 9a11f2707..5658325b2 100644 --- a/alienblaster/project/src/DataDownloader.java +++ b/alienblaster/project/src/DataDownloader.java @@ -190,16 +190,36 @@ class DataDownloader extends Thread } catch( java.io.IOException e ) {}; } - HttpGet request = new HttpGet(Globals.DataDownloadUrl); - request.addHeader("Accept", "*/*"); HttpResponse response = null; - try { - DefaultHttpClient client = new DefaultHttpClient(); - client.getParams().setBooleanParameter("http.protocol.handle-redirects", true); - response = client.execute(request); - } catch (IOException e) { } ; + String [] downloadUrls = Globals.DataDownloadUrl.split("[|]"); + int downloadUrlIndex = 0; + while( downloadUrlIndex < downloadUrls.length && response == null ) + { + System.out.println("Connecting to " + downloadUrls[downloadUrlIndex]); + Status.setText( "Connecting to " + downloadUrls[downloadUrlIndex] ); + HttpGet request = new HttpGet(downloadUrls[downloadUrlIndex]); + request.addHeader("Accept", "*/*"); + try { + DefaultHttpClient client = new DefaultHttpClient(); + client.getParams().setBooleanParameter("http.protocol.handle-redirects", true); + response = client.execute(request); + } catch (IOException e) { + System.out.println("Failed to connect to " + downloadUrls[downloadUrlIndex]); + downloadUrlIndex++; + }; + if( response != null ) + { + if( response.getStatusLine().getStatusCode() != 200 ) + { + response = null; + System.out.println("Failed to connect to " + downloadUrls[downloadUrlIndex]); + downloadUrlIndex++; + } + } + } if( response == null ) { + System.out.println("Error connecting to " + Globals.DataDownloadUrl); Status.setText( "Error connecting to " + Globals.DataDownloadUrl ); return; } diff --git a/alienblaster/project/src/Globals.java b/alienblaster/project/src/Globals.java index fb6370876..2c7166386 100644 --- a/alienblaster/project/src/Globals.java +++ b/alienblaster/project/src/Globals.java @@ -8,7 +8,7 @@ class Globals { public static String ApplicationName = "AlienBlaster"; // Should be zip file - public static String DataDownloadUrl = "http://sites.google.com/site/xpelyax/Home/alienblaster110_data.zip?attredirects=0%26d=1"; // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount + public static String DataDownloadUrl = "http://sites.google.com/site/xpelyax/Home/alienblaster110_data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/alienblaster110_data.zip"; // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // Set DownloadToSdcard to true if your app data is bigger than 5 megabytes. // It will download app data to /sdcard/alienblaster then,