diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-23 16:06:59 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-23 16:06:59 +0100 |
commit | ff0edb2bfe3a729d1ede1f7f03a1ec592669169b (patch) | |
tree | f55a2f6bdf3e2625aa21bcb90801d7ba3b5df5b7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | |
parent | 73ce6fc7bb9cd5a024bfe510e862dd9d6af3d2de (diff) | |
parent | fd24acbf0e54be2be222ca107d97c63f308a1d4a (diff) | |
download | open-keychain-ff0edb2bfe3a729d1ede1f7f03a1ec592669169b.tar.gz open-keychain-ff0edb2bfe3a729d1ede1f7f03a1ec592669169b.tar.bz2 open-keychain-ff0edb2bfe3a729d1ede1f7f03a1ec592669169b.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | 12 |
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..6f85342d6 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 && ClipDescription.compareMimeTypes(metadata.getMimeType(), "text/*")) { + 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); } |