From 7c6eff6d92ebf6383659a101cff1438dcf959ed8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 24 Sep 2014 15:28:51 +0200
Subject: show message about saving multiple files rather than hide the button

---
 .../keychain/ui/EncryptFilesFragment.java          | 31 ++++++----------------
 OpenKeychain/src/main/res/values/strings.xml       |  1 +
 2 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'OpenKeychain')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
index 23021ce44..8569877af 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
@@ -37,6 +37,7 @@ import android.widget.TextView;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.util.FileHelper;
 import org.sufficientlysecure.keychain.provider.TemporaryStorageProvider;
 
@@ -56,7 +57,6 @@ public class EncryptFilesFragment extends Fragment implements EncryptActivityInt
     // view
     private View mAddView;
     private View mShareFile;
-    private View mEncryptFile;
     private ListView mSelectedFiles;
     private SelectedFilesAdapter mAdapter = new SelectedFilesAdapter();
     private final Map<Uri, Bitmap> thumbnailCache = new HashMap<Uri, Bitmap>();
@@ -78,8 +78,8 @@ public class EncryptFilesFragment extends Fragment implements EncryptActivityInt
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.encrypt_file_fragment, container, false);
 
-        mEncryptFile = view.findViewById(R.id.action_encrypt_file);
-        mEncryptFile.setOnClickListener(new View.OnClickListener() {
+        View vEncryptFile = view.findViewById(R.id.action_encrypt_file);
+        vEncryptFile.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 encryptClicked(false);
@@ -130,31 +130,12 @@ public class EncryptFilesFragment extends Fragment implements EncryptActivityInt
         mEncryptInterface.getInputUris().add(inputUri);
         mEncryptInterface.notifyUpdate();
         mSelectedFiles.requestFocus();
-
-        /**
-         * We hide the encrypt to file button if multiple files are selected.
-         *
-         * With Android L it will be possible to select a target directory for multiple files, so we might want to
-         * change this later
-         */
-
-        if (mEncryptInterface.getInputUris().size() > 1) {
-            mEncryptFile.setVisibility(View.GONE);
-        } else {
-            mEncryptFile.setVisibility(View.VISIBLE);
-        }
     }
 
     private void delInputUri(int position) {
         mEncryptInterface.getInputUris().remove(position);
         mEncryptInterface.notifyUpdate();
         mSelectedFiles.requestFocus();
-
-        if (mEncryptInterface.getInputUris().size() > 1) {
-            mEncryptFile.setVisibility(View.GONE);
-        } else {
-            mEncryptFile.setVisibility(View.VISIBLE);
-        }
     }
 
     private void showOutputFileDialog() {
@@ -185,7 +166,11 @@ public class EncryptFilesFragment extends Fragment implements EncryptActivityInt
                 mEncryptInterface.getOutputUris().add(TemporaryStorageProvider.createFile(getActivity(), targetName));
             }
             mEncryptInterface.startEncrypt(true);
-        } else if (mEncryptInterface.getInputUris().size() == 1) {
+        } else {
+            if (mEncryptInterface.getInputUris().size() > 1) {
+                Notify.showNotify(getActivity(), R.string.error_multi_not_supported, Notify.Style.ERROR);
+                return;
+            }
             showOutputFileDialog();
         }
     }
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d39235984..b17196587 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -910,6 +910,7 @@
     <string name="info_no_manual_account_creation">"Do not create OpenKeychain-Accounts manually.\nFor more information, see Help."</string>
     <string name="contact_show_key">"Show key (%s)"</string>
     <string name="swipe_to_update">"Swipe down to update from keyserver"</string>
+    <string name="error_multi_not_supported">"Saving of multiple files not supported. This is a limitation on current Android."</string>
 
     <!-- First Time -->
     <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
-- 
cgit v1.2.3