From c75059120c326410cbaf3618bf0c49a1886a10f9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 24 Aug 2019 19:47:11 +0200
Subject: [PATCH] Show inline images by default

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java       | 4 ++--
 app/src/main/java/eu/faircode/email/FragmentMessages.java     | 2 +-
 .../main/java/eu/faircode/email/FragmentOptionsDisplay.java   | 2 +-
 app/src/main/java/eu/faircode/email/HtmlHelper.java           | 2 +-
 app/src/main/res/layout/fragment_options_display.xml          | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 1234cdc3bd..1024b6dbc1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2403,7 +2403,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 Document document = Jsoup.parse(body);
 
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                boolean inline = prefs.getBoolean("inline_images", false);
+                boolean inline = prefs.getBoolean("inline_images", true);
 
                 boolean has_images = false;
                 for (Element img : document.select("img")) {
@@ -3743,7 +3743,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
 
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-            boolean inline = prefs.getBoolean("inline_images", false);
+            boolean inline = prefs.getBoolean("inline_images", true);
             boolean autocontent = prefs.getBoolean("autocontent", false);
 
             setupWebView(webView);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index e61a736b47..cd54b09671 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3098,7 +3098,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 long id = args.getLong("id");
 
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                boolean inline_images = prefs.getBoolean("inline_images", false);
+                boolean inline_images = prefs.getBoolean("inline_images", true);
 
                 DB db = DB.getInstance(context);
                 try {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index b1c20c906c..fd3a3ece75 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -389,7 +389,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swAttachmentsAlt.setChecked(prefs.getBoolean("attachments_alt", false));
         swContrast.setChecked(prefs.getBoolean("contrast", false));
         swMonospaced.setChecked(prefs.getBoolean("monospaced", false));
-        swImagesInline.setChecked(prefs.getBoolean("inline_images", false));
+        swImagesInline.setChecked(prefs.getBoolean("inline_images", true));
         swImagesContacts.setChecked(prefs.getBoolean("contact_images", true));
         swImagesAll.setChecked(prefs.getBoolean("all_images", false));
         swCollapseQuotes.setChecked(prefs.getBoolean("collapse_quotes", false));
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index c3f7a83eb1..dc4c2b6f3a 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -357,7 +357,7 @@ public class HtmlHelper {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean compact = prefs.getBoolean("compact", false);
         int zoom = prefs.getInt("zoom", compact ? 0 : 1);
-        boolean inline = prefs.getBoolean("inline_images", false);
+        boolean inline = prefs.getBoolean("inline_images", true);
 
         final int px = Helper.dp2pixels(context, (zoom + 1) * 24);
 
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 53cea4fcfa..7bf4632aca 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -301,6 +301,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
+                android:checked="true"
                 android:text="@string/title_advanced_images_inline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"