From 4c2846f4bb3500d650ec949064e69e58f65c3e08 Mon Sep 17 00:00:00 2001
From: fysx <martin@fysx.org>
Date: Wed, 19 Feb 2014 20:57:09 +0100
Subject: [PATCH] download and progress bar somewhat work

---
 AndroidManifest.xml                         | 5 ++---
 src/org/love2d/android/DownloadService.java | 2 --
 src/org/love2d/android/GameActivity.java    | 8 ++++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 856ef9c0..954cbc51 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -8,13 +8,12 @@
     <!-- Allow writing to external storage -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-		<service android:name="DownloadService" />
-
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="LÖVE for Android"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+				android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+				<service android:name=".DownloadService" />
         <activity
             android:name="GameActivity"
             android:configChanges="orientation|screenSize"
diff --git a/src/org/love2d/android/DownloadService.java b/src/org/love2d/android/DownloadService.java
index 41dfeae9..bf6bfaea 100644
--- a/src/org/love2d/android/DownloadService.java
+++ b/src/org/love2d/android/DownloadService.java
@@ -45,8 +45,6 @@ public class DownloadService extends IntentService {
                 resultData.putInt("progress" ,(int) (total * 100 / fileLength));
                 receiver.send(UPDATE_PROGRESS, resultData);
                 output.write(data, 0, count);
-                
-                Log.d ("GameActivity", "Downloading...");
             }
 
             output.flush();
diff --git a/src/org/love2d/android/GameActivity.java b/src/org/love2d/android/GameActivity.java
index ceee2d76..c33ad9f2 100644
--- a/src/org/love2d/android/GameActivity.java
+++ b/src/org/love2d/android/GameActivity.java
@@ -82,8 +82,10 @@ public class GameActivity extends SDLActivity {
     	  mProgressDialog.setIndeterminate(true);
     	  mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
     	  mProgressDialog.setCancelable(true);
+    	  mProgressDialog.setProgress (0);
+    	  mProgressDialog.setMax (100);
     	  
-    	// this is how you fire the downloader
+    	  // this is how you fire the downloader
     	  mProgressDialog.show();
     	  Intent intent = new Intent(this, DownloadService.class);
     	  intent.putExtra("url", url);
@@ -126,8 +128,10 @@ public class GameActivity extends SDLActivity {
 
         @Override
         protected void onReceiveResult(int resultCode, Bundle resultData) {
-            super.onReceiveResult(resultCode, resultData);
+        	super.onReceiveResult(resultCode, resultData);
+
             if (resultCode == DownloadService.UPDATE_PROGRESS) {
+          	    mProgressDialog.setIndeterminate(false);
                 int progress = resultData.getInt("progress");
                 mProgressDialog.setProgress(progress);
                 if (progress == 100) {