Added Send zip menu

k3b · Nov 28, 2018 · 13c4fbf · 13c4fbf
1 parent 040cf18
commit 13c4fbf
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 2 deletions.
diff --git a/app/src/main/java/de/k3b/android/ToGoZip/SettingsActivity.java b/app/src/main/java/de/k3b/android/ToGoZip/SettingsActivity.java
@@ -349,8 +349,11 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onPrepareOptionsMenu(Menu menu) {
         ZipStorage storage = SettingsImpl.getCurrentZipStorage(this);
 
-        updateMenuItem(menu, R.id.cmd_delete, R.string.delete_menu_title, storage.exists());
-        updateMenuItem(menu, R.id.cmd_view_zip, R.string.view_zip_menu_title, storage.exists());
+        final boolean zipExists = storage.exists();
+        updateMenuItem(menu, R.id.cmd_delete, R.string.delete_menu_title, zipExists);
+        updateMenuItem(menu, R.id.cmd_view_zip, R.string.view_zip_menu_title, zipExists);
+        updateMenuItem(menu, R.id.cmd_send, R.string.send_zip_menu_title, zipExists);
+
         updateMenuItem(menu, R.id.cmd_filemanager, 0,
                 FileManagerUtil.hasShowInFilemanager(this, getZipFolder(storage)));
 
@@ -380,6 +383,8 @@ private void updateMenuItem(Menu menu, int cmd, int menuTitle, boolean visible)
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.cmd_send:
+                return onCmdSend(item.getTitle());
             case R.id.cmd_delete:
                 return onCmdDeleteQuestion();
             case R.id.cmd_view_zip:
@@ -434,6 +439,47 @@ private boolean tryStartActivity(Intent startIntent, Uri contentUri, String mime
         return result;
     }
 
+    private boolean onCmdSend(CharSequence title) {
+        ZipStorage storage = SettingsImpl.getCurrentZipStorage(this);
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        Uri contentUri = Uri.parse(storage.getFullZipUriOrNull());
+        String mime = "application/zip";
+
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
+                Intent.FLAG_ACTIVITY_FORWARD_RESULT | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
+
+
+        // EXTRA_CC, EXTRA_BCC
+        // intent.putExtra(Intent.EXTRA_EMAIL, new String[]{toAddress});
+
+        intent.putExtra(Intent.EXTRA_SUBJECT, SettingsImpl.getZipFile());
+
+        // intent.putExtra(Intent.EXTRA_TEXT, body);
+
+        intent.putExtra(Intent.EXTRA_STREAM, contentUri);
+
+        intent.setType(mime);
+
+        final String debugMessage = "SettingsActivity.onCmdSend(" +
+                title +
+                ", startActivity='" + intent.toUri(0)
+                + "')";
+        try {
+            final Intent chooser = Intent.createChooser(intent, title);
+            chooser.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
+                    Intent.FLAG_ACTIVITY_FORWARD_RESULT | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
+            this.startActivity(chooser);
+            if (Global.debugEnabled) {
+                Log.d(Global.LOG_CONTEXT, debugMessage);
+            }
+        }
+        catch(Exception ex) {
+            Log.w(Global.LOG_CONTEXT, debugMessage, ex);
+        }
+
+        return true;
+    }
+
     private boolean onCmdDeleteQuestion() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(getString(R.string.delete_menu_title, SettingsImpl.getZipFile()));

diff --git a/app/src/main/res/menu/menu_config.xml b/app/src/main/res/menu/menu_config.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/cmd_send"
+        android:title="@string/send_zip_menu_title"
+        android:orderInCategory="5"
+        android:showAsAction="never"
+        />
+
     <item android:id="@+id/cmd_view_zip"
         android:title="@string/view_zip_menu_title"
         android:orderInCategory="5"

diff --git a/libK3b/libK3b.iml b/libK3b/libK3b.iml
@@ -40,5 +40,13 @@
     <orderEntry type="library" exported="" scope="TEST" name="Gradle: powermock-reflect-1.5.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="Gradle: javassist-3.18.0-GA" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="Gradle: objenesis-1.2" level="project" />
+    <orderEntry type="library" exported="" name="libK3b.libK3b-L2.0.15" level="project" />
+    <orderEntry type="library" exported="" name="libK3b.libK3b-L2.0.15" level="project" />
+    <orderEntry type="library" exported="" name="libK3b.libK3b-L2.0.15" level="project" />
+    <orderEntry type="library" exported="" name="libK3b.libK3b-L2.0.15" level="project" />
+    <orderEntry type="library" exported="" name="libK3b.libK3b-L2.0.15" level="project" />
+    <orderEntry type="library" exported="" name="libK3b.libK3b-L2.0.15" level="project" />
+    <orderEntry type="library" exported="" name="libK3b.libK3b-L2.0.15" level="project" />
+    <orderEntry type="library" exported="" name="libK3b.libK3b-L2.0.15" level="project" />
   </component>
 </module>