Major refactor of down dictionary list is stored by app.

[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
old mode 100755 (executable)
new mode 100644 (file)
index 96d68ab..1e7a083
--- a/src/com/hughes/android/dictionary/DownloadActivity.java
+++ b/src/com/hughes/android/dictionary/DownloadActivity.java
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//     http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+\r
 package com.hughes.android.dictionary;\r
 \r
 import java.io.File;\r
@@ -25,9 +39,11 @@ public class DownloadActivity extends Activity {
 \r
   public static final String SOURCE = "source";\r
   public static final String DEST = "dest";\r
+  public static final String MESSAGE = "message";\r
 \r
   String source;\r
   String dest;\r
+  String message;\r
   long bytesProcessed = 0;\r
   long contentLength = -1;\r
 \r
@@ -35,16 +51,26 @@ public class DownloadActivity extends Activity {
   private final Handler uiHandler = new Handler();\r
 \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
+    final Intent intent = new Intent();\r
+    intent.setClassName(DownloadActivity.class.getPackage().getName(), DownloadActivity.class.getName());\r
+    intent.putExtra(SOURCE, source);\r
+    intent.putExtra(DEST, dest);\r
+    intent.putExtra(MESSAGE, message);\r
+    return intent;\r
+  }\r
 \r
   /** Called when the activity is first created. */\r
   @Override\r
   public void onCreate(final Bundle savedInstanceState) {\r
-    ((DictionaryApplication)getApplication()).applyTheme(this);\r
+    //((DictionaryApplication)getApplication()).applyTheme(this);\r
 \r
     super.onCreate(savedInstanceState);\r
     final Intent intent = getIntent();\r
     source = intent.getStringExtra(SOURCE);\r
     dest = intent.getStringExtra(DEST);\r
+    message = intent.getStringExtra(MESSAGE);\r
     if (source == null || dest == null) {\r
       throw new RuntimeException("null source or dest.");\r
     }\r
@@ -108,6 +134,15 @@ public class DownloadActivity extends Activity {
           \r
           setDownloadStatus(String.format(getString(R.string.downloadFinished),\r
               bytesProcessed));\r
+          \r
+          // If all went well, we can exit this activity.\r
+          uiHandler.post(new Runnable() {\r
+            @Override\r
+            public void run() {\r
+              finish();\r
+            }\r
+          });\r
+          \r
         } catch (IOException e) {\r
           Log.e("THAD", "Error downloading file", e);\r
           setDownloadStatus(String.format(getString(R.string.errorDownloadingFile), e.getLocalizedMessage()));\r