cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decrypt: special case single encrypted text -> directly display text, if not too large

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-10-21 22:30:21 +02:00
parent 4e60f1bc75
commit 7eb9f5d5cf
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View File

@@ -322,6 +322,29 @@ public class DecryptListFragment
Uri uri = mCurrentInputUri;
mCurrentInputUri = null;
Activity activity = getActivity();
boolean isSingleInput = mInputDataResults.isEmpty() && mPendingInputUris.isEmpty();
if (isSingleInput) {
// there is always at least one mMetadata object, so we know this is >= 1 already
boolean isSingleMetadata = result.mMetadata.size() == 1;
OpenPgpMetadata metadata = result.mMetadata.get(0);
boolean isText = "text/plain".equals(metadata.getMimeType());
boolean isOverSized = metadata.getOriginalSize() > Constants.TEXT_LENGTH_LIMIT;
if (isSingleMetadata && isText && !isOverSized) {
Intent displayTextIntent = new Intent(activity, DisplayTextActivity.class)
.setDataAndType(result.mOutputUris.get(0), "text/plain")
.putExtra(DisplayTextActivity.EXTRA_RESULT, result.mDecryptVerifyResult)
.putExtra(DisplayTextActivity.EXTRA_METADATA, metadata);
activity.startActivity(displayTextIntent);
activity.finish();
return;
}
}
mInputDataResults.put(uri, result);
processResult(uri);