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

Open decrypted application/pgp-keys only in OpenKeychain

Browse Source
This commit is contained in:
Dominik Schürmann
2015-10-15 16:48:24 +02:00
parent 759ffc5a4b
commit 6ea89a0892
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,8 +378,8 @@ public class DecryptListFragment
// noinspection deprecation, this should be called from Context, but not available in minSdk // noinspection deprecation, this should be called from Context, but not available in minSdk
icon = getResources().getDrawable(R.drawable.ic_chat_black_24dp); icon = getResources().getDrawable(R.drawable.ic_chat_black_24dp);
} else if (ClipDescription.compareMimeTypes(type, "application/pgp-keys")) { } else if (ClipDescription.compareMimeTypes(type, "application/pgp-keys")) {
// noinspection deprecation, this should be called from Context, but not available in minSdk // noinspection deprecation, this should be called from Context, but not available in minSdk
icon = getResources().getDrawable(R.drawable.ic_key_plus_grey600_24dp); icon = getResources().getDrawable(R.drawable.ic_key_plus_grey600_24dp);
} else if (ClipDescription.compareMimeTypes(type, "image/*")) { } else if (ClipDescription.compareMimeTypes(type, "image/*")) {
int px = FormattingUtils.dpToPx(context, 32); int px = FormattingUtils.dpToPx(context, 32);
Bitmap bitmap = FileHelper.getThumbnail(context, outputUri, new Point(px, px)); Bitmap bitmap = FileHelper.getThumbnail(context, outputUri, new Point(px, px));
@@ -533,6 +533,11 @@ public class DecryptListFragment
} else { } else {
intent = new Intent(Intent.ACTION_VIEW); intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(outputUri, metadata.getMimeType()); intent.setDataAndType(outputUri, metadata.getMimeType());
if ("application/pgp-keys".equals(metadata.getMimeType())) {
// bind Intent to this OpenKeychain, don't allow other apps to intercept here!
intent.setPackage(getActivity().getPackageName());
}
} }
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);