Trying to update to newest Android settings.

[Dictionary.git] / src / com / hughes / android / dictionary / DownloadActivity.java

diff --git a/src/com/hughes/android/dictionary/DownloadActivity.java b/src/com/hughes/android/dictionary/DownloadActivity.java
index 1e7a083e2b1fb3b7a2950457fe9c486f4f16af57..a5cfc9a2563485f2d3dcb9f9708665944807dcfe 100644 (file)
--- a/src/com/hughes/android/dictionary/DownloadActivity.java
+++ b/src/com/hughes/android/dictionary/DownloadActivity.java
@@ -14,6 +14,14 @@
 \r
 package com.hughes.android.dictionary;\r
 \r
+import android.app.Activity;\r
+import android.content.Intent;\r
+import android.os.Bundle;\r
+import android.os.Handler;\r
+import android.util.Log;\r
+import android.widget.ProgressBar;\r
+import android.widget.TextView;\r
+\r
 import java.io.File;\r
 import java.io.FileOutputStream;\r
 import java.io.IOException;\r
@@ -27,14 +35,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.zip.ZipEntry;\r
 import java.util.zip.ZipFile;\r
 \r
-import android.app.Activity;\r
-import android.content.Intent;\r
-import android.os.Bundle;\r
-import android.os.Handler;\r
-import android.util.Log;\r
-import android.widget.ProgressBar;\r
-import android.widget.TextView;\r
-\r
 public class DownloadActivity extends Activity {\r
 \r
   public static final String SOURCE = "source";\r
@@ -52,7 +52,7 @@ public class DownloadActivity extends Activity {
 \r
   final AtomicBoolean stop = new AtomicBoolean(false);\r
   \r
-  public static Intent getLaunchIntent(final String dictFile, final String source, final String dest, final String message) {\r
+  public static Intent getLaunchIntent(final String source, final String dest, final String message) {\r
     final Intent intent = new Intent();\r
     intent.setClassName(DownloadActivity.class.getPackage().getName(), DownloadActivity.class.getName());\r
     intent.putExtra(SOURCE, source);\r
@@ -64,7 +64,7 @@ public class DownloadActivity extends Activity {
   /** Called when the activity is first created. */\r
   @Override\r
   public void onCreate(final Bundle savedInstanceState) {\r
-    //((DictionaryApplication)getApplication()).applyTheme(this);\r
+    setTheme(((DictionaryApplication)getApplication()).getSelectedTheme().themeId);\r
 \r
     super.onCreate(savedInstanceState);\r
     final Intent intent = getIntent();\r
@@ -82,6 +82,9 @@ public class DownloadActivity extends Activity {
     final TextView destTextView = (TextView) findViewById(R.id.dest);\r
     destTextView.setText(dest);\r
 \r
+    final TextView messageTextView = (TextView) findViewById(R.id.downloadMessage);\r
+    messageTextView.setText(message);\r
+\r
     final ProgressBar progressBar = (ProgressBar) findViewById(R.id.downloadProgressBar);\r
     progressBar.setIndeterminate(false);\r
     progressBar.setMax(100);\r
@@ -95,7 +98,9 @@ public class DownloadActivity extends Activity {
 \r
         try {\r
           final File destFile = new File(dest);\r
-          destFile.getParentFile().mkdirs();\r
+          if (destFile.getAbsoluteFile().getParent() != null) {\r
+            destFile.getAbsoluteFile().getParentFile().mkdirs();\r
+          }\r
 \r
           final File destTmpFile = File.createTempFile("dictionaryDownload", "tmp", destFile\r
               .getParentFile());\r
@@ -129,6 +134,7 @@ public class DownloadActivity extends Activity {
               final OutputStream zipOut = new FileOutputStream(destUnzipped);\r
               contentLength = zipEntry.getSize();\r
               bytesRead = copyStream(zipIn, zipOut, R.string.unzipping);\r
+              destFile.delete();\r
             }\r
           }\r
           \r