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

Added support for SVG in messages

This commit is contained in:
M66B 2021-07-18 12:15:25 +02:00
parent 289d9fc0cd
commit 76ed2d766d
3 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/AdapterImage.java
View File

@ -79,7 +79,8 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
private void bindTo(EntityAttachment attachment) {
if (attachment.available) {
Bitmap bm = ImageHelper.decodeImage(attachment.getFile(context),
Bitmap bm = ImageHelper.decodeImage(
attachment.getFile(context), attachment.getMimeType(),
context.getResources().getDisplayMetrics().widthPixels);
if (bm == null)
ivImage.setImageResource(R.drawable.twotone_broken_image_24);

9
app/src/main/java/eu/faircode/email/ContactInfo.java
View File

@ -726,7 +726,7 @@ public class ContactInfo {
}
@NonNull
private static Favicon getFavicon(URL url, String type, int scaleToPixels, Context context) throws IOException {
private static Favicon getFavicon(URL url, String mimeType, int scaleToPixels, Context context) throws IOException {
Log.i("GET favicon " + url);
if (!"https".equals(url.getProtocol()))
@ -751,12 +751,7 @@ public class ContactInfo {
if (status != HttpURLConnection.HTTP_OK)
throw new FileNotFoundException("Error " + status + ": " + connection.getResponseMessage());
if ("image/svg+xml".equals(type) || url.getPath().endsWith(".svg")) {
Bitmap bitmap = ImageHelper.renderSvg(connection.getInputStream(), Color.WHITE, scaleToPixels);
return new Favicon(bitmap);
}
Bitmap bitmap = ImageHelper.getScaledBitmap(connection.getInputStream(), url.toString(), scaleToPixels);
Bitmap bitmap = ImageHelper.getScaledBitmap(connection.getInputStream(), url.toString(), mimeType, scaleToPixels);
if (bitmap == null)
throw new FileNotFoundException("decodeStream");
else {

52
app/src/main/java/eu/faircode/email/ImageHelper.java
View File

@ -63,6 +63,7 @@ import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
@ -306,7 +307,10 @@ class ImageHelper {
int scaleToPixels = res.getDisplayMetrics().widthPixels;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
try {
Drawable d = getScaledDrawable(context, attachment.getFile(context), scaleToPixels);
Drawable d = getScaledDrawable(context,
attachment.getFile(context),
attachment.getMimeType(),
scaleToPixels);
if (view != null)
fitDrawable(d, a, scale, view);
return d;
@ -317,7 +321,10 @@ class ImageHelper {
return d;
}
} else {
Bitmap bm = decodeImage(attachment.getFile(context), scaleToPixels);
Bitmap bm = decodeImage(
attachment.getFile(context),
attachment.getMimeType(),
scaleToPixels);
if (bm == null) {
Log.i("Image not decodable CID=" + cid);
Drawable d = context.getDrawable(R.drawable.twotone_broken_image_24);
@ -338,8 +345,9 @@ class ImageHelper {
if (data && (show || inline || a.tracking))
try {
int scaleToPixels = res.getDisplayMetrics().widthPixels;
String mimeType = getDataUriType(a.source);
ByteArrayInputStream bis = getDataUriStream(a.source);
Bitmap bm = getScaledBitmap(bis, "data:" + getDataUriType(a.source), scaleToPixels);
Bitmap bm = getScaledBitmap(bis, "data:" + mimeType, mimeType, scaleToPixels);
if (bm == null)
throw new IllegalArgumentException("decode byte array failed");
@ -364,7 +372,7 @@ class ImageHelper {
Bitmap bm;
int scaleToPixels = res.getDisplayMetrics().widthPixels;
try (InputStream is = context.getContentResolver().openInputStream(uri)) {
bm = getScaledBitmap(is, a.source, scaleToPixels);
bm = getScaledBitmap(is, a.source, null, scaleToPixels);
if (bm == null)
throw new FileNotFoundException(a.source);
}
@ -449,7 +457,7 @@ class ImageHelper {
}
// Download image
Drawable d = downloadImage(context, id, a.source);
Drawable d = downloadImage(context, id, a.source, null);
fitDrawable(d, a, scale, view);
post(d, a.source);
} catch (Throwable ex) {
@ -599,7 +607,7 @@ class ImageHelper {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
try {
return getScaledDrawable(context, file, dm.widthPixels);
return getScaledDrawable(context, file, null, dm.widthPixels);
} catch (IOException ex) {
Log.i(ex);
return null;
@ -617,7 +625,7 @@ class ImageHelper {
}
@NonNull
private static Drawable downloadImage(Context context, long id, String source) throws IOException {
private static Drawable downloadImage(Context context, long id, String source, String mimeType) throws IOException {
Resources res = context.getResources();
DisplayMetrics dm = res.getDisplayMetrics();
@ -677,12 +685,12 @@ class ImageHelper {
try (FileOutputStream fos = new FileOutputStream(file)) {
Helper.copy(urlConnection.getInputStream(), fos);
}
return getScaledDrawable(context, file, dm.widthPixels);
return getScaledDrawable(context, file, null, dm.widthPixels);
}
bm = getScaledBitmap(
urlConnection.getInputStream(),
source,
source, mimeType,
Math.max(dm.widthPixels, dm.heightPixels));
} finally {
if (urlConnection != null)
@ -707,7 +715,7 @@ class ImageHelper {
}
@RequiresApi(api = Build.VERSION_CODES.P)
static Drawable getScaledDrawable(Context context, File file, int scaleToPixels) throws IOException {
static Drawable getScaledDrawable(Context context, File file, String mimeType, int scaleToPixels) throws IOException {
Drawable d;
try {
@ -739,7 +747,7 @@ class ImageHelper {
at android.graphics.ImageDecoder.decodeDrawableImpl(ImageDecoder.java:1758)
at android.graphics.ImageDecoder.decodeDrawable(ImageDecoder.java:1751)
*/
Bitmap bm = _decodeImage(file, scaleToPixels);
Bitmap bm = _decodeImage(file, mimeType, scaleToPixels);
if (bm == null)
throw new FileNotFoundException(file.getAbsolutePath());
d = new BitmapDrawable(context.getResources(), bm);
@ -749,7 +757,12 @@ class ImageHelper {
return d;
}
static Bitmap getScaledBitmap(InputStream is, String source, int scaleToPixels) throws IOException {
static Bitmap getScaledBitmap(InputStream is, String source, String mimeType, int scaleToPixels) throws IOException {
if (TextUtils.isEmpty(mimeType))
mimeType = Helper.guessMimeType(source);
if ("image/svg+xml".equals(mimeType))
return ImageHelper.renderSvg(is, Color.WHITE, scaleToPixels);
BufferedInputStream bis = new BufferedInputStream(is);
Log.i("Probe " + source);
@ -780,16 +793,23 @@ class ImageHelper {
return new File(dir, id + "_" + Math.abs(source.hashCode()) + extension);
}
static Bitmap decodeImage(File file, int scaleToPixels) {
static Bitmap decodeImage(File file, String mimeType, int scaleToPixels) {
try {
return _decodeImage(file, scaleToPixels);
} catch (OutOfMemoryError ex) {
return _decodeImage(file, mimeType, scaleToPixels);
} catch (IOException | OutOfMemoryError ex) {
Log.e(ex);
return null;
}
}
private static Bitmap _decodeImage(File file, int scaleToPixels) {
private static Bitmap _decodeImage(File file, String mimeType, int scaleToPixels) throws IOException {
if (mimeType == null)
mimeType = Helper.guessMimeType(file.getName());
if ("image/svg+xml".equals(mimeType))
try (FileInputStream fis = new FileInputStream(file)) {
return ImageHelper.renderSvg(fis, Color.WHITE, scaleToPixels);
}
BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
BitmapFactory.decodeFile(file.getAbsolutePath(), options);