diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-22 22:22:45 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-22 22:22:45 +0100 |
commit | 4df63ccdeb8bd26f507c88980b360bdc367faa0f (patch) | |
tree | f0589226486a5f34acdcb005381d4e04f7e4b209 /OpenKeychain/src/main/java | |
parent | f61de278b4ca452678c1d791a9e0944cc6e93001 (diff) | |
download | open-keychain-4df63ccdeb8bd26f507c88980b360bdc367faa0f.tar.gz open-keychain-4df63ccdeb8bd26f507c88980b360bdc367faa0f.tar.bz2 open-keychain-4df63ccdeb8bd26f507c88980b360bdc367faa0f.zip |
displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java | 11 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DisplayTextFragment.java | 6 |
2 files changed, 16 insertions, 1 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); } |