Support installing local dictionary zip files.

Has app show up as an open option from e.g.
browser.

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 945d192034d91cbfba72a2411f72a0d6b82fb535..b57203f24e1b371c86a9106603069e7bc6296997 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,6 +44,60 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
+            <!-- Direct installation of dictionaries -->
+            <!-- When opening from downloads, no proper file name is sent -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"
+                      android:host="*"
+                      android:pathPattern=".*"
+                      android:mimeType="application/zip" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="file"
+                      android:host="*"
+                      android:pathPattern=".*"
+                      android:mimeType="application/zip" />
+            <!-- Handling cases with no mimeType (maybe not necessary?)
+                 works for files not in downloads -->
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"
+                      android:host="*"
+                      android:pathPattern=".*\\.quickdic\\.v006\\.zip" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="file"
+                      android:host="*"
+                      android:pathPattern=".*\\.quickdic\\.v006\\.zip" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content"
+                      android:host="*"
+                      android:pathPattern=".*\\.quickdic\\.v007\\.zip" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="file"
+                      android:host="*"
+                      android:pathPattern=".*\\.quickdic\\.v007\\.zip" />
+            </intent-filter>
 
             <!--
                <meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
@@ -87,6 +141,7 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <!-- Allow direct opening of dictionary files -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -94,13 +149,25 @@
                       android:host="*"
                       android:mimeType="application/octet-stream"
                       android:pathPattern=".*\\.quickdic" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="file"
                       android:host="*"
                       android:mimeType="application/octet-stream"
                       android:pathPattern=".*\\.quickdic" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="content"
                       android:host="*"
                       android:pathPattern=".*\\.quickdic" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="file"
                       android:host="*"
                       android:pathPattern=".*\\.quickdic" />

diff --git a/Util b/Util
index 1f1b243cb81d95167abba1c9005d7ae61f6d70fe..a7bfc9e9fe94486a358662b650078c5a2b9d73ea 160000 (submodule)
--- a/Util
+++ b/Util
@@ -1 +1 @@
-Subproject commit 1f1b243cb81d95167abba1c9005d7ae61f6d70fe
+Subproject commit a7bfc9e9fe94486a358662b650078c5a2b9d73ea

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 1b27dbe5e17ff2b8a3975ab3fab27eb974d61841..833429ad522c3fa480011d96b3dd958a1e400df4 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -188,59 +188,65 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                 Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
                                Toast.LENGTH_LONG).show();
 
-
-                final Uri zipUri = Uri.parse(dest);
-                File localZipFile = null;
-                InputStream zipFileStream = null;
-                ZipInputStream zipFile = null;
-                FileOutputStream zipOut = null;
-                try {
-                    if (zipUri.getScheme().equals("content")) {
-                        zipFileStream = context.getContentResolver().openInputStream(zipUri);
-                        localZipFile = null;
-                    } else {
-                        localZipFile = new File(zipUri.getPath());
-                        zipFileStream = new FileInputStream(localZipFile);
-                    }
-                    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());
-                    if (targetFile.exists()) {
-                        targetFile.renameTo(new File(targetFile.getAbsolutePath().replace(".quickdic", ".bak.quickdic")));
-                        targetFile = new File(application.getDictDir(), zipEntry.getName());
-                    }
-                    zipOut = new FileOutputStream(targetFile);
-                    copyStream(zipFile, zipOut);
-                    application.backgroundUpdateDictionaries(dictionaryUpdater);
-                    Toast.makeText(context, getString(R.string.installationFinished, dest),
-                                   Toast.LENGTH_LONG).show();
+                if (unzipInstall(context, Uri.parse(dest), dest)) {
                     finishedDownloadIds.add(downloadId);
                     Log.w(LOG, "Unzipping finished: " + dest + " Id: " + downloadId);
-                } catch (Exception e) {
-                    String msg = getString(R.string.unzippingFailed, dest);
-                    File dir = application.getDictDir();
-                    if (!dir.canWrite() || !application.checkFileCreate(dir)) {
-                        msg = getString(R.string.notWritable, dir.getAbsolutePath());
-                    }
-                    new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(msg).setNeutralButton("Close", null).show();
-                    Log.e(LOG, "Failed to unzip.", e);
-                } finally {
-                    try {
-                        if (zipOut != null) zipOut.close();
-                    } catch (IOException e) {}
-                    try {
-                        if (zipFile != null) zipFile.close();
-                    } catch (IOException e) {}
-                    try {
-                        if (zipFileStream != null) zipFileStream.close();
-                    } catch (IOException e) {}
-                    if (localZipFile != null) localZipFile.delete();
                 }
             }
         }
     };
 
+    private boolean unzipInstall(Context context, Uri zipUri, String dest) {
+        File localZipFile = null;
+        InputStream zipFileStream = null;
+        ZipInputStream zipFile = null;
+        FileOutputStream zipOut = null;
+        boolean result = false;
+        try {
+            if (zipUri.getScheme().equals("content")) {
+                zipFileStream = context.getContentResolver().openInputStream(zipUri);
+                localZipFile = null;
+            } else {
+                localZipFile = new File(zipUri.getPath());
+                zipFileStream = new FileInputStream(localZipFile);
+            }
+            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());
+            if (targetFile.exists()) {
+                targetFile.renameTo(new File(targetFile.getAbsolutePath().replace(".quickdic", ".bak.quickdic")));
+                targetFile = new File(application.getDictDir(), zipEntry.getName());
+            }
+            zipOut = new FileOutputStream(targetFile);
+            copyStream(zipFile, zipOut);
+            application.backgroundUpdateDictionaries(dictionaryUpdater);
+            Toast.makeText(context, getString(R.string.installationFinished, dest),
+                           Toast.LENGTH_LONG).show();
+            result = true;
+        } catch (Exception e) {
+            String msg = getString(R.string.unzippingFailed, dest);
+            File dir = application.getDictDir();
+            if (!dir.canWrite() || !application.checkFileCreate(dir)) {
+                msg = getString(R.string.notWritable, dir.getAbsolutePath());
+            }
+            new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(msg).setNeutralButton("Close", null).show();
+            Log.e(LOG, "Failed to unzip.", e);
+        } finally {
+            try {
+                if (zipOut != null) zipOut.close();
+            } catch (IOException e) {}
+            try {
+                if (zipFile != null) zipFile.close();
+            } catch (IOException e) {}
+            try {
+                if (zipFileStream != null) zipFileStream.close();
+            } catch (IOException e) {}
+            if (localZipFile != null) localZipFile.delete();
+        }
+        return result;
+    }
+
     public static Intent getLaunchIntent(Context c) {
         final Intent intent = new Intent(c, DictionaryManagerActivity.class);
         intent.putExtra(C.CAN_AUTO_LAUNCH_DICT, false);
@@ -335,6 +341,14 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         readableCheckAndError(true);
 
         onCreateSetupActionBar();
+
+        final Intent intent = getIntent();
+        if (intent != null && intent.getAction() != null &&
+            intent.getAction().equals(Intent.ACTION_VIEW)) {
+            blockAutoLaunch = true;
+            Uri uri = intent.getData();
+            unzipInstall(this, uri, uri.getLastPathSegment());
+        }
     }
 
     private void onCreateSetupActionBar() {