diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-19 15:45:20 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-19 15:45:20 +0200 |
commit | 4c1d48bd951cbc302bdb2821bdfd501405f3abe0 (patch) | |
tree | 4a3c702d348ebe425ec53aa8c3b59147b4a43ac7 /OpenKeychain/src/main/java/org/sufficientlysecure | |
parent | 35eee40d70ca5d29bdedfb7a2fc1ca688f42dca3 (diff) | |
download | open-keychain-4c1d48bd951cbc302bdb2821bdfd501405f3abe0.tar.gz open-keychain-4c1d48bd951cbc302bdb2821bdfd501405f3abe0.tar.bz2 open-keychain-4c1d48bd951cbc302bdb2821bdfd501405f3abe0.zip |
use intent icon as fallback if we get no thumbnail
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | 6 |
1 files changed, 4 insertions, 2 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 dcba595e9..a72277052 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java @@ -376,10 +376,12 @@ public class DecryptListFragment // noinspection deprecation, this should be called from Context, but not available in minSdk icon = getResources().getDrawable(R.drawable.ic_chat_black_24dp); } else if (ClipDescription.compareMimeTypes(type, "image/*")) { - int px = FormattingUtils.dpToPx(context, 48); + int px = FormattingUtils.dpToPx(context, 32); Bitmap bitmap = FileHelper.getThumbnail(context, outputUri, new Point(px, px)); icon = new BitmapDrawable(context.getResources(), bitmap); - } else { + } + + if (icon == null) { final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setDataAndType(outputUri, type); |