aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2016-02-22 22:22:18 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2016-02-22 22:22:18 +0100
commitf61de278b4ca452678c1d791a9e0944cc6e93001 (patch)
tree97f35354f9609fcbdea42c65f728d1d9d9943223
parent19930bdd5cc335937c9255bc20296b44ee78350a (diff)
downloadopen-keychain-f61de278b4ca452678c1d791a9e0944cc6e93001.tar.gz
open-keychain-f61de278b4ca452678c1d791a9e0944cc6e93001.tar.bz2
open-keychain-f61de278b4ca452678c1d791a9e0944cc6e93001.zip
decrypt: always show "View in OpenKeychain" as intent chooser option iff isLikelyText
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java12
1 files changed, 12 insertions, 0 deletions
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 9419cf8ce..9ffd95ae9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
@@ -591,6 +591,18 @@ public class DecryptListFragment
Intent chooserIntent = Intent.createChooser(intent, getString(R.string.intent_show));
chooserIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+ if (!share && metadata.isLooksLikeText()) {
+ LabeledIntent internalIntent = new LabeledIntent(
+ new Intent(intent)
+ .setClass(activity, DisplayTextActivity.class)
+ .putExtra(DisplayTextActivity.EXTRA_RESULT, result.mDecryptVerifyResult)
+ .putExtra(DisplayTextActivity.EXTRA_METADATA, metadata),
+ BuildConfig.APPLICATION_ID, R.string.view_internal, R.mipmap.ic_launcher);
+ chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS,
+ new Parcelable[] { internalIntent });
+ }
+
startActivity(chooserIntent);
}