From 6f828dc8af0a5e00763ac6f4c1c1194d6d93391d Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 6 Jan 2025 18:28:51 +0100 Subject: [PATCH] Small improvement --- app/src/main/java/eu/faircode/email/ContactInfo.java | 4 ++-- app/src/main/java/eu/faircode/email/FragmentCompose.java | 3 +-- .../main/java/eu/faircode/email/FragmentDialogEditImage.java | 2 +- app/src/main/java/eu/faircode/email/FragmentDialogPrint.java | 2 +- app/src/main/java/eu/faircode/email/ImageHelper.java | 3 ++- app/src/main/java/eu/faircode/email/OpenAI.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java index cb55467767..40ac614cef 100644 --- a/app/src/main/java/eu/faircode/email/ContactInfo.java +++ b/app/src/main/java/eu/faircode/email/ContactInfo.java @@ -548,7 +548,7 @@ public class ContactInfo { "." + info.type + (info.verified ? "_verified" : "")); try (OutputStream os = new BufferedOutputStream(new FileOutputStream(output))) { - info.bitmap.compress(Bitmap.CompressFormat.PNG, 90, os); + info.bitmap.compress(Bitmap.CompressFormat.PNG, ImageHelper.DEFAULT_PNG_COMPRESSION, os); } Log.i("Avatar to cache=" + output.getName()); } @@ -614,7 +614,7 @@ public class ContactInfo { // Add to cache File output = new File(dir, etag + "." + info.type); try (OutputStream os = new BufferedOutputStream(new FileOutputStream(output))) { - info.bitmap.compress(Bitmap.CompressFormat.PNG, 90, os); + info.bitmap.compress(Bitmap.CompressFormat.PNG, ImageHelper.DEFAULT_PNG_COMPRESSION, os); } catch (IOException ex) { Log.e(ex); } diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index d16953bb51..763cc5f873 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -328,7 +328,6 @@ public class FragmentCompose extends FragmentBase { private int searchIndex = 0; static final int REDUCED_IMAGE_SIZE = 1440; // pixels - private static final int REDUCED_IMAGE_QUALITY = 90; // percent // http://regex.info/blog/lightroom-goodies/jpeg-quality private static final int COPY_ATTACHMENT_TIMEOUT = 60; // seconds @@ -5590,7 +5589,7 @@ public class FragmentCompose extends FragmentBase { File tmp = new File(file.getAbsolutePath() + ".tmp"); try (OutputStream out = new BufferedOutputStream(new FileOutputStream(tmp))) { - if (!resized.compress(format, REDUCED_IMAGE_QUALITY, out)) + if (!resized.compress(format, ImageHelper.DEFAULT_PNG_COMPRESSION, out)) throw new IOException("compress"); } catch (Throwable ex) { Log.w(ex); diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogEditImage.java b/app/src/main/java/eu/faircode/email/FragmentDialogEditImage.java index d18b4e28aa..9f10587daa 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogEditImage.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogEditImage.java @@ -121,7 +121,7 @@ public class FragmentDialogEditImage extends FragmentDialogBase { File file = attachment.getFile(context); try (OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) { - bm.compress(Bitmap.CompressFormat.PNG, 90, os); + bm.compress(Bitmap.CompressFormat.PNG, ImageHelper.DEFAULT_PNG_COMPRESSION, os); } db.attachment().setName(id, attachment.name, "image/png", file.length()); diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogPrint.java b/app/src/main/java/eu/faircode/email/FragmentDialogPrint.java index 067ac7fb53..e1ee891cd9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogPrint.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogPrint.java @@ -370,7 +370,7 @@ public class FragmentDialogPrint extends FragmentDialogBase { d.draw(canvas); Helper.ByteArrayInOutStream bos = new Helper.ByteArrayInOutStream(); - bm.compress(Bitmap.CompressFormat.PNG, 90, bos); + bm.compress(Bitmap.CompressFormat.PNG, ImageHelper.DEFAULT_PNG_COMPRESSION, bos); uri = ImageHelper.getDataUri(bos.getInputStream(), "image/png"); } } catch (Throwable ex) { diff --git a/app/src/main/java/eu/faircode/email/ImageHelper.java b/app/src/main/java/eu/faircode/email/ImageHelper.java index 4c8bb456ab..bf8273de64 100644 --- a/app/src/main/java/eu/faircode/email/ImageHelper.java +++ b/app/src/main/java/eu/faircode/email/ImageHelper.java @@ -83,6 +83,7 @@ import java.util.concurrent.Semaphore; class ImageHelper { static final int DOWNLOAD_TIMEOUT = 15; // seconds + static final int DEFAULT_PNG_COMPRESSION = 90; private static final int MAX_PROBE = 128 * 1024; // bytes private static final int SLOW_CONNECTION = 2 * 1024; // Kbps private static final int MAX_BITMAP_SIZE = 100 * 1024 * 1024; // RecordingCanvas.MAX_BITMAP_SIZE @@ -765,7 +766,7 @@ class ImageHelper { if (id >= 0) { File file = getCacheFile(context, id, source, ".png"); try (OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) { - bm.compress(Bitmap.CompressFormat.PNG, 90, os); + bm.compress(Bitmap.CompressFormat.PNG, ImageHelper.DEFAULT_PNG_COMPRESSION, os); } } diff --git a/app/src/main/java/eu/faircode/email/OpenAI.java b/app/src/main/java/eu/faircode/email/OpenAI.java index 84ea7753b1..1254634aa3 100644 --- a/app/src/main/java/eu/faircode/email/OpenAI.java +++ b/app/src/main/java/eu/faircode/email/OpenAI.java @@ -311,7 +311,7 @@ public class OpenAI { try (InputStream is = new FileInputStream(file)) { Bitmap bm = ImageHelper.getScaledBitmap(is, null, null, SCALE2PIXELS); Helper.ByteArrayInOutStream bos = new Helper.ByteArrayInOutStream(); - bm.compress(Bitmap.CompressFormat.PNG, 90, bos); + bm.compress(Bitmap.CompressFormat.PNG, ImageHelper.DEFAULT_PNG_COMPRESSION, bos); url = ImageHelper.getDataUri(bos.getInputStream(), "image/png"); } catch (Throwable ex) { Log.w(ex);