displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu

4 files changed, 27 insertions, 7 deletions

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 351b62ba7..bc3470b0a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui;
 
 import java.util.ArrayList;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -472,6 +473,16 @@ public abstract class DecryptFragment extends Fragment implements LoaderManager.
 
     protected abstract void onVerifyLoaded(boolean hideErrorOverlay);
 
+    public void startDisplayLogActivity() {
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+        Intent intent = new Intent(activity, LogDisplayActivity.class);
+        intent.putExtra(LogDisplayFragment.EXTRA_RESULT, mDecryptVerifyResult);
+        activity.startActivity(intent);
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (mImportOpHelper != null) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DisplayTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DisplayTextFragment.java
index 1060714f0..97f723168 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DisplayTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DisplayTextFragment.java
@@ -103,7 +103,7 @@ public class DisplayTextFragment extends DecryptFragment {
         Bundle args = getArguments();
 
         String plaintext = args.getString(ARG_PLAINTEXT);
-        DecryptVerifyResult result = args.getParcelable(ARG_DECRYPT_VERIFY_RESULT);
+        DecryptVerifyResult result =  args.getParcelable(ARG_DECRYPT_VERIFY_RESULT);
 
         // display signature result in activity
         mText.setText(plaintext);
@@ -137,6 +137,10 @@ public class DisplayTextFragment extends DecryptFragment {
                 copyToClipboard(mText.getText().toString());
                 break;
             }
+            case R.id.decrypt_view_log: {
+                startDisplayLogActivity();
+                break;
+            }
             default: {
                 return super.onOptionsItemSelected(item);
             }
diff --git a/OpenKeychain/src/main/res/menu/decrypt_menu.xml b/OpenKeychain/src/main/res/menu/decrypt_menu.xml
index 0b81ea1db..4e31fb6a6 100644
--- a/OpenKeychain/src/main/res/menu/decrypt_menu.xml
+++ b/OpenKeychain/src/main/res/menu/decrypt_menu.xml
@@ -3,15 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
+        android:id="@+id/decrypt_share"
+        android:title="@string/btn_share_decrypted_text"
+        android:icon="@drawable/ic_share_black_24dp"
+        app:showAsAction="ifRoom" />
+
+    <item
         android:id="@+id/decrypt_copy"
         android:title="@string/btn_copy_decrypted_text"
         android:icon="@drawable/ic_content_copy_black_24dp"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
     <item
-        android:id="@+id/decrypt_share"
-        android:title="@string/btn_share_decrypted_text"
-        android:icon="@drawable/ic_share_black_24dp"
-        app:showAsAction="ifRoom" />
+        android:id="@+id/decrypt_view_log"
+        android:title="@string/btn_view_log"
+        app:showAsAction="never" />
 
 </menu>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 7d66c06a1..9920d8057 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -95,7 +95,7 @@
     <string name="btn_add_files">"Add file(s)"</string>
     <string name="btn_share_decrypted_text">"Share"</string>
     <string name="btn_open_with">"Open with…"</string>
-    <string name="btn_copy_decrypted_text">"Copy decrypted text"</string>
+    <string name="btn_copy_decrypted_text">"Copy to clipboard"</string>
     <string name="btn_decrypt_clipboard">"Read from clipboard"</string>
     <string name="btn_decrypt_files">"Select input file"</string>
     <string name="btn_encrypt_files">"Encrypt files"</string>