Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 06:08:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Media improvements

Browse Source
This commit is contained in:
M66B
2024-01-25 08:40:32 +01:00
parent 41464507e0
commit a35fcd876e
3 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/eu/faircode/email/AdapterMedia.java
View File

@@ -123,7 +123,7 @@ public class AdapterMedia extends RecyclerView.Adapter<AdapterMedia.ViewHolder>
}
@Override
protected Drawable onExecute(Context context, Bundle args) throws Throwable {
protected Drawable onExecute(Context context, Bundle args) {
File file = (File) args.getSerializable("file");
String type = args.getString("type");
int max = args.getInt("max");
@@ -147,18 +147,21 @@ public class AdapterMedia extends RecyclerView.Adapter<AdapterMedia.ViewHolder>
return null;
}
} else if (type != null && type.startsWith("video/")) {
Bitmap bm = ThumbnailUtils.createVideoThumbnail(file, new Size(max, max), null);
if (bm == null)
return null;
return new BitmapDrawable(context.getResources(), bm);
try {
Bitmap bm = ThumbnailUtils.createVideoThumbnail(file, new Size(max, max), null);
if (bm == null)
return null;
return new BitmapDrawable(context.getResources(), bm);
} catch (Throwable ex) {
Log.i(ex);
return context.getDrawable(R.drawable.twotone_ondemand_video_24);
}
} else {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean webp = prefs.getBoolean("webp", true);
if ("image/webp".equalsIgnoreCase(type) && !webp) {
args.putBoolean("nowebp", true);
return null;
}
if ("image/webp".equalsIgnoreCase(type) && !webp)
return context.getDrawable(R.drawable.twotone_image_not_supported_24);
args.putLong("size", file.length());
@@ -196,15 +199,18 @@ public class AdapterMedia extends RecyclerView.Adapter<AdapterMedia.ViewHolder>
@Override
protected void onExecuted(Bundle args, Drawable image) {
if (image == null)
if (args.getBoolean("nowebp"))
ivImage.setImageResource(R.drawable.twotone_warning_24);
if (image == null) {
String type = args.getString("type");
if ("application/pdf".equals(type))
ivImage.setImageResource(R.drawable.twotone_article_24);
else if (attachment.isVideo())
ivImage.setImageResource(R.drawable.twotone_ondemand_video_24);
else
ivImage.setImageResource(R.drawable.twotone_broken_image_24);
else
} else {
ivImage.setImageDrawable(image);
ImageHelper.animate(context, image);
ImageHelper.animate(context, image);
}
StringBuilder sb = new StringBuilder();
@@ -248,7 +254,7 @@ public class AdapterMedia extends RecyclerView.Adapter<AdapterMedia.ViewHolder>
protected void onException(Bundle args, Throwable ex) {
tvCaption.setText(Log.formatThrowable(ex));
tvCaption.setVisibility(View.VISIBLE);
ivImage.setImageResource(R.drawable.twotone_broken_image_24);
ivImage.setImageResource(R.drawable.twotone_warning_24);
}
}.execute(context, owner, args, "image:load");
} else