Fix error message when download manager in unavailable.

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

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 91d603043f342fcbf7e9f3be2676ef7786edde11..1b27dbe5e17ff2b8a3975ab3fab27eb974d61841 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -32,6 +32,7 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.MenuItemCompat;
@@ -69,6 +70,7 @@ import android.widget.ToggleButton;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.util.IntentLauncher;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -77,6 +79,8 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -189,7 +193,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                 File localZipFile = null;
                 InputStream zipFileStream = null;
                 ZipInputStream zipFile = null;
-                OutputStream zipOut = null;
+                FileOutputStream zipOut = null;
                 try {
                     if (zipUri.getScheme().equals("content")) {
                         zipFileStream = context.getContentResolver().openInputStream(zipUri);
@@ -198,7 +202,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                         localZipFile = new File(zipUri.getPath());
                         zipFileStream = new FileInputStream(localZipFile);
                     }
-                    zipFile = new ZipInputStream(zipFileStream);
+                    zipFile = new ZipInputStream(new BufferedInputStream(zipFileStream));
                     final ZipEntry zipEntry = zipFile.getNextEntry();
                     Log.d(LOG, "Unzipping entry: " + zipEntry.getName());
                     File targetFile = new File(application.getDictDir(), zipEntry.getName());
@@ -278,14 +282,16 @@ public class DictionaryManagerActivity extends ActionBarActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        // This must be first, otherwise the actiona bar doesn't get
+        DictionaryApplication.INSTANCE.init(getApplicationContext());
+        application = DictionaryApplication.INSTANCE;
+        // This must be first, otherwise the action bar doesn't get
         // styled properly.
-        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
+        setTheme(application.getSelectedTheme().themeId);
 
         super.onCreate(savedInstanceState);
         Log.d(LOG, "onCreate:" + this);
 
-        application = (DictionaryApplication) getApplication();
+        setTheme(application.getSelectedTheme().themeId);
 
         blockAutoLaunch = false;
 
@@ -384,16 +390,24 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         unregisterReceiver(broadcastReceiver);
     }
 
-    private static int copyStream(final InputStream in, final OutputStream out)
+    private static void copyStream(final InputStream ins, final FileOutputStream outs)
     throws IOException {
+        ByteBuffer buf = ByteBuffer.allocateDirect(1024 * 64);
+        FileChannel out = outs.getChannel();
         int bytesRead;
-        final byte[] bytes = new byte[1024 * 16];
-        while ((bytesRead = in.read(bytes)) != -1) {
-            out.write(bytes, 0, bytesRead);
-        }
-        in.close();
-        out.close();
-        return bytesRead;
+        int pos = 0;
+        final byte[] bytes = new byte[1024 * 64];
+        do {
+            bytesRead = ins.read(bytes, pos, bytes.length - pos);
+            if (bytesRead != -1) pos += bytesRead;
+            if (bytesRead == -1 ? pos != 0 : 2*pos >= bytes.length) {
+                buf.put(bytes, 0, pos);
+                pos = 0;
+                buf.flip();
+                while (buf.hasRemaining()) out.write(buf);
+                buf.clear();
+            }
+        } while (bytesRead != -1);
     }
 
     @Override
@@ -449,6 +463,10 @@ public class DictionaryManagerActivity extends ActionBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
+        if ("true".equals(Settings.System.getString(getContentResolver(), "firebase.test.lab")))
+        {
+            return false; // testing the menu is not very interesting
+        }
         final MenuItem sort = menu.add(getString(R.string.sortDicts));
         MenuItemCompat.setShowAsAction(sort, MenuItem.SHOW_AS_ACTION_NEVER);
         sort.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@@ -645,8 +663,8 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             builder.append(getString(R.string.updateAvailable));
         }
         for (IndexInfo indexInfo : sortedIndexInfos) {
-            final View button = application.createButton(buttons.getContext(), dictionaryInfo,
-                                indexInfo);
+            final View button = IsoUtils.INSTANCE.createButton(buttons.getContext(), dictionaryInfo,
+                                indexInfo, application.languageButtonPixels);
             buttons.addView(button);
 
             if (canLaunch) {
@@ -706,8 +724,9 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         // Due to a bug, cursor is null instead of empty when
         // the download manager is disabled.
         if (cursor == null) {
+            String msg = getString(R.string.downloadManagerQueryFailed);
             new AlertDialog.Builder(DictionaryManagerActivity.this).setTitle(getString(R.string.error))
-            .setMessage(getString(R.string.downloadFailed, R.string.downloadManagerQueryFailed))
+            .setMessage(getString(R.string.downloadFailed, msg))
             .setNeutralButton("Close", null).show();
             return;
         }