1 files changed, 51 insertions, 27 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
index 9c6c89c43..6f576a112 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
@@ -23,6 +23,9 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -39,7 +42,6 @@ import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
 import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
 import org.sufficientlysecure.keychain.ui.util.Notify;
-import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.ShareHelper;
 
 import java.io.UnsupportedEncodingException;
@@ -54,6 +56,7 @@ public class DecryptTextFragment extends DecryptFragment {
 
     // model
     private String mCiphertext;
+    private boolean mShowMenuOptions = false;
 
     /**
      * Creates new instance of this fragment
@@ -79,22 +82,6 @@ public class DecryptTextFragment extends DecryptFragment {
         mInvalidLayout = (LinearLayout) view.findViewById(R.id.decrypt_text_invalid);
         mText = (TextView) view.findViewById(R.id.decrypt_text_plaintext);
 
-        View vShareButton = view.findViewById(R.id.action_decrypt_share_plaintext);
-        vShareButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(sendWithChooserExcludingEncrypt(mText.getText().toString()));
-            }
-        });
-
-        View vCopyButton = view.findViewById(R.id.action_decrypt_copy_plaintext);
-        vCopyButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                copyToClipboard(mText.getText().toString());
-            }
-        });
-
         Button vInvalidButton = (Button) view.findViewById(R.id.decrypt_text_invalid_button);
         vInvalidButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -110,9 +97,9 @@ public class DecryptTextFragment extends DecryptFragment {
     /**
      * Create Intent Chooser but exclude decrypt activites
      */
-    private Intent sendWithChooserExcludingEncrypt(String text) {
+    private Intent sendWithChooserExcludingDecrypt(String text) {
         Intent prototype = createSendIntent(text);
-        String title = getString(R.string.title_share_file);
+        String title = getString(R.string.title_share_message);
 
         // we don't want to decrypt the decrypted, no inception ;)
         String[] blacklist = new String[]{
@@ -139,6 +126,8 @@ public class DecryptTextFragment extends DecryptFragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        setHasOptionsMenu(true);
+
         String ciphertext = getArguments().getString(ARG_CIPHERTEXT);
         if (ciphertext != null) {
             mCiphertext = ciphertext;
@@ -147,6 +136,33 @@ public class DecryptTextFragment extends DecryptFragment {
     }
 
     @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        if (mShowMenuOptions) {
+            inflater.inflate(R.menu.decrypt_menu, menu);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.decrypt_share: {
+                startActivity(sendWithChooserExcludingDecrypt(mText.getText().toString()));
+                break;
+            }
+            case R.id.decrypt_copy: {
+                copyToClipboard(mText.getText().toString());
+                break;
+            }
+            default: {
+                return super.onOptionsItemSelected(item);
+            }
+        }
+
+        return true;
+    }
+
+    @Override
     protected void cryptoOperation(CryptoInputParcel cryptoInput) {
         // Send all information needed to service to decrypt in other thread
         Intent intent = new Intent(getActivity(), KeychainIntentService.class);
@@ -206,15 +222,8 @@ public class DecryptTextFragment extends DecryptFragment {
                         pgpResult.createNotify(getActivity()).show();
 
                         // display signature result in activity
-                        boolean valid = onResult(pgpResult);
+                        loadVerifyResult(pgpResult);
 
-                        if (valid) {
-                            mInvalidLayout.setVisibility(View.GONE);
-                            mValidLayout.setVisibility(View.VISIBLE);
-                        } else {
-                            mInvalidLayout.setVisibility(View.VISIBLE);
-                            mValidLayout.setVisibility(View.GONE);
-                        }
                     } else {
                         pgpResult.createNotify(getActivity()).show();
                         // TODO: show also invalid layout with different text?
@@ -234,4 +243,19 @@ public class DecryptTextFragment extends DecryptFragment {
         getActivity().startService(intent);
     }
 
+    @Override
+    protected void onVerifyLoaded(boolean verified) {
+
+        mShowMenuOptions = verified;
+        getActivity().supportInvalidateOptionsMenu();
+
+        if (verified) {
+            mInvalidLayout.setVisibility(View.GONE);
+            mValidLayout.setVisibility(View.VISIBLE);
+        } else {
+            mInvalidLayout.setVisibility(View.VISIBLE);
+            mValidLayout.setVisibility(View.GONE);
+        }
+
+    }
 }