Fixed showing inline images HTML

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -1739,7 +1739,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                         HtmlHelper.setViewport(document);
                         if (inline || show_images)
-                            HtmlHelper.embedInlineImages(context, message.id, document);
+                            HtmlHelper.embedInlineImages(context, message.id, document, show_images || !inline);
 
                         boolean disable_tracking = prefs.getBoolean("disable_tracking", true);
                         if (disable_tracking)

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -5893,7 +5893,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                 Document document = JsoupEx.parse(file);
                 HtmlHelper.truncate(document, false);
-                HtmlHelper.embedInlineImages(context, id, document);
+                HtmlHelper.embedInlineImages(context, id, document, true);
 
                 Element p = document.createElement("p");
 

app/src/main/java/eu/faircode/email/HtmlHelper.java

@@ -57,7 +57,9 @@ import org.jsoup.select.NodeVisitor;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -1054,7 +1056,7 @@ public class HtmlHelper {
         }
     }
 
-    static void embedInlineImages(Context context, long id, Document document) throws IOException {
+    static void embedInlineImages(Context context, long id, Document document, boolean local) throws IOException {
         DB db = DB.getInstance(context);
         for (Element img : document.select("img")) {
             String src = img.attr("src");
@@ -1063,24 +1065,25 @@ public class HtmlHelper {
                 EntityAttachment attachment = db.attachment().getAttachment(id, cid);
                 if (attachment != null && attachment.available) {
                     File file = attachment.getFile(context);
-                    Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+                    if (local) {
-                    img.attr("src", uri.toString());
+                        Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
-                    Log.i("Inline image uri=" + uri);
+                        img.attr("src", uri.toString());
-/*
+                        Log.i("Inline image uri=" + uri);
-                    try (InputStream is = new FileInputStream(file)) {
+                    } else {
-                        byte[] bytes = new byte[(int) file.length()];
+                        try (InputStream is = new FileInputStream(file)) {
-                        if (is.read(bytes) != bytes.length)
+                            byte[] bytes = new byte[(int) file.length()];
-                            throw new IOException("length");
+                            if (is.read(bytes) != bytes.length)
-
+                                throw new IOException("length");
-                        StringBuilder sb = new StringBuilder();
+
-                        sb.append("data:");
+                            StringBuilder sb = new StringBuilder();
-                        sb.append(attachment.type);
+                            sb.append("data:");
-                        sb.append(";base64,");
+                            sb.append(attachment.type);
-                        sb.append(Base64.encodeToString(bytes, Base64.NO_WRAP));
+                            sb.append(";base64,");
-
+                            sb.append(Base64.encodeToString(bytes, Base64.NO_WRAP));
-                        img.attr("src", sb.toString());
+
+                            img.attr("src", sb.toString());
+                        }
                     }
-*/
                 }
             }
         }