From d19f4fbb5c914252969e1ad7757c4c6232095f33 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Mon, 12 Oct 2015 20:45:07 +0100
Subject: [PATCH] Update the progress bar with the install progress.

---
 android/res/layout/download_voice_data.xml    |  9 ++++--
 .../reecedunn/espeak/DownloadVoiceData.java   | 29 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/android/res/layout/download_voice_data.xml b/android/res/layout/download_voice_data.xml
index e0611ce0..b0db52a2 100644
--- a/android/res/layout/download_voice_data.xml
+++ b/android/res/layout/download_voice_data.xml
@@ -7,10 +7,13 @@
     android:padding="16dp" >
 
     <ProgressBar
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
+        style="@android:style/Widget.ProgressBar.Horizontal"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp" />
+        android:layout_marginBottom="16dp"
+        android:id="@+id/progress"
+        android:indeterminate="false"
+        android:longClickable="false" />
 
     <TextView
         android:id="@+id/installing_voice_data"
diff --git a/android/src/com/reecedunn/espeak/DownloadVoiceData.java b/android/src/com/reecedunn/espeak/DownloadVoiceData.java
index 9bda49d6..48ee1ead 100755
--- a/android/src/com/reecedunn/espeak/DownloadVoiceData.java
+++ b/android/src/com/reecedunn/espeak/DownloadVoiceData.java
@@ -23,13 +23,13 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.accessibility.AccessibilityEvent;
+import android.widget.ProgressBar;
 
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.LinkedList;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -37,16 +37,18 @@ public class DownloadVoiceData extends Activity {
     public static final String BROADCAST_LANGUAGES_UPDATED = "com.reecedunn.espeak.LANGUAGES_UPDATED";
 
     private AsyncExtract mAsyncExtract;
+    private ProgressBar mProgress;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.download_voice_data);
+        mProgress = (ProgressBar)findViewById(R.id.progress);
 
         final File dataPath = CheckVoiceData.getDataPath(this).getParentFile();
 
-        mAsyncExtract = new AsyncExtract(this, R.raw.espeakdata, dataPath) {
+        mAsyncExtract = new AsyncExtract(this, R.raw.espeakdata, dataPath, mProgress) {
             @Override
             protected void onPostExecute(Integer result) {
                 switch (result) {
@@ -80,15 +82,14 @@ public class DownloadVoiceData extends Activity {
 
     private static final int PROGRESS_STARTING = 0;
     private static final int PROGRESS_EXTRACTING = 1;
-    private static final int PROGRESS_FINISHED = 2;
 
     private static class ExtractProgress {
-        long total;
-        long progress = 0;
+        int total;
+        int progress = 0;
         int state = PROGRESS_STARTING;
         File file;
 
-        public ExtractProgress(long total) {
+        public ExtractProgress(int total) {
             this.total = total;
         }
     }
@@ -97,11 +98,13 @@ public class DownloadVoiceData extends Activity {
         private final Context mContext;
         private final int mRawResId;
         private final File mOutput;
+        private final ProgressBar mProgress;
 
-        public AsyncExtract(Context context, int rawResId, File output) {
+        public AsyncExtract(Context context, int rawResId, File output, ProgressBar progress) {
             mContext = context;
             mRawResId = rawResId;
             mOutput = output;
+            mProgress = progress;
         }
 
         @Override
@@ -153,9 +156,6 @@ public class DownloadVoiceData extends Activity {
                 final File outputFile = new File(mOutput, "espeak-data/version");
 
                 FileUtils.write(outputFile, version);
-
-                progress.state = PROGRESS_FINISHED;
-                publishProgress(progress);
                 return RESULT_OK;
             } catch (Exception e) {
                 e.printStackTrace();
@@ -169,5 +169,14 @@ public class DownloadVoiceData extends Activity {
 
             return RESULT_CANCELED;
         }
+
+        @Override
+        protected void onProgressUpdate(ExtractProgress... progress) {
+            if (progress[0].state == PROGRESS_STARTING) {
+                mProgress.setMax(progress[0].total);
+            } else {
+                mProgress.setProgress(progress[0].progress);
+            }
+        }
     }
 }