Fixed data downloading

This commit is contained in:
pelya
2010-08-21 17:21:40 +03:00
parent ac6a031c7d
commit ffec83a679
15 changed files with 75 additions and 51 deletions

View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package com.googlecode.opentyrian;
package com.sourceforge.sc2;
import android.app.Activity;
import android.content.Context;
@@ -150,7 +150,7 @@ class DataDownloader extends Thread
@Override
public void run()
{
String [] downloadFiles = Globals.DataDownloadUrl.split("[^]");
String [] downloadFiles = Globals.DataDownloadUrl.split("\\^");
for( int i = 0; i < downloadFiles.length; i++ )
{
if( downloadFiles[i].length() > 0 && Globals.OptionalDataDownload.length > i && Globals.OptionalDataDownload[i] )
@@ -258,7 +258,11 @@ class DataDownloader extends Thread
if(DoNotUnzip)
{
path = downloadUrls[downloadUrlIndex].substring(downloadUrls[downloadUrlIndex].lastIndexOf("/")+1, downloadUrls[downloadUrlIndex].indexOf("?"));
path = getOutFilePath(downloadUrls[downloadUrlIndex].substring(
downloadUrls[downloadUrlIndex].lastIndexOf("/")+1,
downloadUrls[downloadUrlIndex].indexOf("?") > 0 ?
downloadUrls[downloadUrlIndex].indexOf("?") :
downloadUrls[downloadUrlIndex].length() ));
OutputStream out = null;
try {
out = new FileOutputStream( path );