mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent crash on attaching very large pictures

This commit is contained in:
M66B 2019-08-18 09:08:36 +02:00
parent 4bb5c4f35e
commit 18bda701f8
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -41,6 +41,7 @@ import android.graphics.BitmapFactory;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.LevelListDrawable; import android.graphics.drawable.LevelListDrawable;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@ -68,6 +69,7 @@ import android.text.style.RelativeSizeSpan;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.text.style.URLSpan; import android.text.style.URLSpan;
import android.text.style.UnderlineSpan; import android.text.style.UnderlineSpan;
import android.util.DisplayMetrics;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -2993,6 +2995,7 @@ public class FragmentCompose extends FragmentBase {
private Html.ImageGetter cidGetter = new Html.ImageGetter() { private Html.ImageGetter cidGetter = new Html.ImageGetter() {
@Override @Override
public Drawable getDrawable(final String source) { public Drawable getDrawable(final String source) {
Log.i("Loading source=" + source);
final LevelListDrawable lld = new LevelListDrawable(); final LevelListDrawable lld = new LevelListDrawable();
Resources res = getContext().getResources(); Resources res = getContext().getResources();
@ -3019,12 +3022,14 @@ public class FragmentCompose extends FragmentBase {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", working); args.putLong("id", working);
args.putString("cid", "<" + source.substring(4) + ">"); args.putString("cid", "<" + source.substring(4) + ">");
args.putInt("scaleToPixels", res.getDisplayMetrics().widthPixels);
new SimpleTask<Drawable>() { new SimpleTask<Bitmap>() {
@Override @Override
protected Drawable onExecute(Context context, Bundle args) { protected Bitmap onExecute(Context context, Bundle args) {
long id = args.getLong("id"); long id = args.getLong("id");
String cid = args.getString("cid"); String cid = args.getString("cid");
int scaleToPixels = args.getInt("scaleToPixels");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
EntityAttachment attachment = db.attachment().getAttachment(id, cid); EntityAttachment attachment = db.attachment().getAttachment(id, cid);
@ -3032,14 +3037,20 @@ public class FragmentCompose extends FragmentBase {
return null; return null;
File file = attachment.getFile(context); File file = attachment.getFile(context);
return Drawable.createFromPath(file.getAbsolutePath()); return Helper.decodeImage(file, scaleToPixels);
} }
@Override @Override
protected void onExecuted(Bundle args, Drawable image) { protected void onExecuted(Bundle args, Bitmap bm) {
if (image == null) if (bm == null)
lld.setLevel(0); // broken lld.setLevel(0); // broken
else { else {
Drawable image = new BitmapDrawable(res, bm);
DisplayMetrics dm = res.getDisplayMetrics();
image.setBounds(0, 0,
Math.round(bm.getWidth() * dm.density),
Math.round(bm.getHeight() * dm.density));
lld.addLevel(2, 2, image); lld.addLevel(2, 2, image);
lld.setLevel(2); // image lld.setLevel(2); // image