changed to work with multi-decrypt

16 files changed, 99 insertions, 228 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java
index b3a447c84..7a473e49f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java
@@ -86,4 +86,9 @@ public class ConsolidateDialogActivity extends FragmentActivity
         // don't care about result (for now?)
         ConsolidateDialogActivity.this.finish();
     }
+
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
index 1cf4b5a56..a045b34f5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -268,6 +268,11 @@ public class CreateKeyFinalFragment
                 getActivity().setResult(Activity.RESULT_OK, data);
                 getActivity().finish();
             }
+
+            @Override
+            public boolean onCryptoSetProgress(String msg, int progress, int max) {
+                return false;
+            }
         };
 
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
deleted file mode 100644
index fcad560ad..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.ui;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
-import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel;
-import org.sufficientlysecure.keychain.ui.util.Notify;
-import org.sufficientlysecure.keychain.util.FileHelper;
-
-import java.io.File;
-
-public class DecryptFilesFragment extends DecryptFragment {
-    public static final String ARG_URI = "uri";
-    public static final String ARG_OPEN_DIRECTLY = "open_directly";
-
-    private static final int REQUEST_CODE_INPUT = 0x00007003;
-    private static final int REQUEST_CODE_OUTPUT = 0x00007007;
-
-    // view
-    private TextView mFilename;
-    private CheckBox mDeleteAfter;
-    private View mDecryptButton;
-
-    // model
-    private Uri mInputUri = null;
-    private Uri mOutputUri = null;
-
-    /**
-     * Creates new instance of this fragment
-     */
-    public static DecryptFilesFragment newInstance(Uri uri, boolean openDirectly) {
-        DecryptFilesFragment frag = new DecryptFilesFragment();
-
-        Bundle args = new Bundle();
-        args.putParcelable(ARG_URI, uri);
-        args.putBoolean(ARG_OPEN_DIRECTLY, openDirectly);
-
-        frag.setArguments(args);
-
-        return frag;
-    }
-
-    /**
-     * Inflate the layout for this fragment
-     */
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.decrypt_files_fragment, container, false);
-
-        mFilename = (TextView) view.findViewById(R.id.decrypt_files_filename);
-        mDeleteAfter = (CheckBox) view.findViewById(R.id.decrypt_files_delete_after_decryption);
-        mDecryptButton = view.findViewById(R.id.decrypt_files_action_decrypt);
-        view.findViewById(R.id.decrypt_files_browse).setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                    FileHelper.openDocument(DecryptFilesFragment.this, "*/*", REQUEST_CODE_INPUT);
-                } else {
-                    FileHelper.openFile(DecryptFilesFragment.this, mInputUri, "*/*",
-                            REQUEST_CODE_INPUT);
-                }
-            }
-        });
-        mDecryptButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                decryptAction();
-            }
-        });
-
-        return view;
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-
-        outState.putParcelable(ARG_URI, mInputUri);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        Bundle state = savedInstanceState != null ? savedInstanceState : getArguments();
-        setInputUri(state.<Uri>getParcelable(ARG_URI));
-
-        // should only come from args
-        if (state.getBoolean(ARG_OPEN_DIRECTLY, false)) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                FileHelper.openDocument(DecryptFilesFragment.this, "*/*", REQUEST_CODE_INPUT);
-            } else {
-                FileHelper.openFile(DecryptFilesFragment.this, mInputUri, "*/*", REQUEST_CODE_INPUT);
-            }
-        }
-    }
-
-    private void setInputUri(Uri inputUri) {
-        if (inputUri == null) {
-            mInputUri = null;
-            mFilename.setText("");
-            return;
-        }
-
-        mInputUri = inputUri;
-        mFilename.setText(FileHelper.getFilename(getActivity(), mInputUri));
-    }
-
-    private void decryptAction() {
-        if (mInputUri == null) {
-            Notify.create(getActivity(), R.string.no_file_selected, Notify.Style.ERROR).show();
-            return;
-        }
-
-        cryptoOperation();
-    }
-
-    private String removeEncryptedAppend(String name) {
-        if (name.endsWith(Constants.FILE_EXTENSION_ASC)
-                || name.endsWith(Constants.FILE_EXTENSION_PGP_MAIN)
-                || name.endsWith(Constants.FILE_EXTENSION_PGP_ALTERNATE)) {
-            return name.substring(0, name.length() - 4);
-        }
-        return name;
-    }
-
-    private void askForOutputFilename(String originalFilename) {
-        if (TextUtils.isEmpty(originalFilename)) {
-            originalFilename = removeEncryptedAppend(FileHelper.getFilename(getActivity(), mInputUri));
-        }
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-            File file = new File(mInputUri.getPath());
-            File parentDir = file.exists() ? file.getParentFile() : Constants.Path.APP_DIR;
-            File targetFile = new File(parentDir, originalFilename);
-            FileHelper.saveFile(this, getString(R.string.title_decrypt_to_file),
-                    getString(R.string.specify_file_to_decrypt_to), targetFile, REQUEST_CODE_OUTPUT);
-        } else {
-            FileHelper.saveDocument(this, "*/*", originalFilename, REQUEST_CODE_OUTPUT);
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case REQUEST_CODE_INPUT: {
-                if (resultCode == Activity.RESULT_OK && data != null) {
-                    setInputUri(data.getData());
-                }
-                return;
-            }
-
-            case REQUEST_CODE_OUTPUT: {
-                // This happens after output file was selected, so start our operation
-                if (resultCode == Activity.RESULT_OK && data != null) {
-                    mOutputUri = data.getData();
-                    cryptoOperation();
-                }
-                return;
-            }
-
-            default: {
-                super.onActivityResult(requestCode, resultCode, data);
-            }
-        }
-    }
-
-    @Override
-    protected void onVerifyLoaded(boolean hideErrorOverlay) {
-
-    }
-
-    @Override
-    protected PgpDecryptVerifyInputParcel createOperationInput() {
-        return new PgpDecryptVerifyInputParcel(mInputUri, mOutputUri).setAllowSymmetricDecryption(true);
-    }
-
-    @Override
-    protected void onCryptoOperationSuccess(DecryptVerifyResult result) {
-
-        // display signature result in activity
-        loadVerifyResult(result);
-
-        // TODO delete after decrypt not implemented!
-
-    }
-
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
index 9cfe1651c..4eb8cd5e8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
@@ -182,6 +182,11 @@ public abstract class DecryptFragment extends Fragment implements LoaderManager.
             public void onCryptoOperationError(ImportKeyResult result) {
                 result.createNotify(getActivity()).show();
             }
+
+            @Override
+            public boolean onCryptoSetProgress(String msg, int progress, int max) {
+                return false;
+            }
         };
 
         mImportOpHelper = new CryptoOperationHelper<>(this, callback, R.string.progress_importing);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
index d2bff8336..d70af4058 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
@@ -258,12 +258,6 @@ public class DecryptListFragment
         mAdapter.setProgress(mCurrentInputUri, progress, max, msg);
         return true;
     }
-
-    @Override
-    protected void dismissProgress() {
-        // progress shown inline, so never mind
-    }
-
     @Override
     protected void onCryptoOperationError(DecryptVerifyResult result) {
         final Uri uri = mCurrentInputUri;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index b05cc6f50..ba4f759e6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -502,4 +502,9 @@ public class ImportKeysActivity extends BaseNfcActivity
     public void onCryptoOperationError(ImportKeyResult result) {
         handleResult(result);
     }
+
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
index 0a7bd726a..da713d0d8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
@@ -259,6 +259,11 @@ public class ImportKeysProxyActivity extends FragmentActivity
         return;
     }
 
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
+
     /**
      * NFC: Parses the NDEF Message from the intent and prints to the TextView
      */
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index d80e3db39..e038cf948 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -631,6 +631,11 @@ public class KeyListFragment extends LoaderFragment
             public void onCryptoOperationError(ConsolidateResult result) {
                 result.createNotify(getActivity()).show();
             }
+
+            @Override
+            public boolean onCryptoSetProgress(String msg, int progress, int max) {
+                return false;
+            }
         };
 
         mConsolidateOpHelper =
@@ -749,6 +754,11 @@ public class KeyListFragment extends LoaderFragment
         result.createNotify(getActivity()).show();
     }
 
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
+
     public class KeyListAdapter extends KeyAdapter implements StickyListHeadersAdapter {
 
         private HashMap<Integer, Boolean> mSelection = new HashMap<>();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
index 240dbe7ad..a1cb77546 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
@@ -208,4 +208,9 @@ public class SafeSlingerActivity extends BaseActivity
         setResult(RESULT_OK, data);
         finish();
     }
+
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index a4215c67d..8b49f3b96 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -145,4 +145,9 @@ public class UploadKeyActivity extends BaseActivity
     public void onCryptoOperationError(ExportResult result) {
         // TODO: Implement proper log for key upload then show error
     }
+
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 4b157590d..d3849c892 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -986,4 +986,9 @@ public class ViewKeyActivity extends BaseNfcActivity implements
         mIsRefreshing = false;
         result.createNotify(this).show();
     }
+
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java
index 03f8ca447..6052eec16 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java
@@ -471,6 +471,11 @@ public class ViewKeyTrustFragment extends LoaderFragment implements
         displaySpannableResult(ssb);
     }
 
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
+
     private void displaySpannableResult(SpannableStringBuilder ssb) {
         mProofVerifyHeader.setVisibility(View.VISIBLE);
         mProofVerifyDetail.setVisibility(View.VISIBLE);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
index b3828c428..31450c841 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
@@ -57,6 +57,12 @@ public abstract class CryptoOperationFragment<T extends Parcelable, S extends Op
             public void onCryptoOperationError(S result) {
                 CryptoOperationFragment.this.onCryptoOperationError(result);
             }
+
+            @Override
+            public boolean onCryptoSetProgress(String msg, int progress, int max) {
+                return CryptoOperationFragment.this.onCryptoSetProgress(msg, progress, max);
+            }
+
         };
 
         mOperationHelper = new CryptoOperationHelper<>(this, callback);
@@ -79,7 +85,15 @@ public abstract class CryptoOperationFragment<T extends Parcelable, S extends Op
     }
 
     protected void cryptoOperation(CryptoInputParcel cryptoInput) {
-        mOperationHelper.cryptoOperation(cryptoInput);
+        cryptoOperation(cryptoInput);
+    }
+
+    protected void cryptoOperation(CryptoInputParcel cryptoInput, boolean showProgress) {
+        mOperationHelper.cryptoOperation(cryptoInput, showProgress);
+    }
+
+    protected boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
     }
 
     protected void onCryptoOperationError(S result) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
index a0ff4664b..44c36e5f1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
@@ -57,6 +57,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
         void onCryptoOperationSuccess(S result);
         void onCryptoOperationCancelled();
         void onCryptoOperationError(S result);
+        boolean onCryptoSetProgress(String msg, int progress, int max);
     }
 
     public static final int REQUEST_CODE_PASSPHRASE = 0x00008001;
@@ -224,7 +225,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
 
     }
 
-    public void cryptoOperation(CryptoInputParcel cryptoInput) {
+    public void cryptoOperation(CryptoInputParcel cryptoInput, boolean showProgress) {
 
         FragmentActivity activity = mUseFragment ? mFragment.getActivity() : mActivity;
 
@@ -259,18 +260,31 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
                     onHandleResult(result);
                 }
             }
-        };
 
-        saveHandler.showProgressDialog(
-                activity.getString(mProgressMessageResource),
-                ProgressDialog.STYLE_HORIZONTAL, false);
+            @Override
+            protected void onSetProgress(String msg, int progress, int max) {
+                // allow handling of progress in fragment, or delegate upwards
+                if ( ! mCallback.onCryptoSetProgress(msg, progress, max)) {
+                    super.onSetProgress(msg, progress, max);
+                }
+            }
+        };
 
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(saveHandler);
         intent.putExtra(KeychainService.EXTRA_MESSENGER, messenger);
 
+        if (showProgress) {
+            saveHandler.showProgressDialog(
+                    activity.getString(mProgressMessageResource),
+                    ProgressDialog.STYLE_HORIZONTAL, false);
+        }
+
         activity.startService(intent);
+    }
 
+    public void cryptoOperation(CryptoInputParcel cryptoInputParcel) {
+        cryptoOperation(cryptoInputParcel, true);
     }
 
     public void cryptoOperation() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index 03850aa92..7fc9da9ec 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
@@ -190,6 +190,11 @@ public class DeleteKeyDialogFragment extends DialogFragment
         handleResult(result);
     }
 
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
+
     public void handleResult(DeleteResult result) {
         try {
             Bundle data = new Bundle();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
index 3daf53425..9567fc9c0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
@@ -105,4 +105,9 @@ public class ExportHelper
     public void onCryptoOperationError(ExportResult result) {
         result.createNotify(mActivity).show();
     }
+
+    @Override
+    public boolean onCryptoSetProgress(String msg, int progress, int max) {
+        return false;
+    }
 }