From 09f489d1391cc6a0c225082bf8774becf4e15915 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 22 Oct 2019 12:01:10 +0200
Subject: [PATCH] Added hint about unused inline images

---
 .../java/eu/faircode/email/FragmentCompose.java     |  8 ++++++++
 app/src/main/res/layout/fragment_compose.xml        | 13 ++++++++++++-
 app/src/main/res/values/strings.xml                 |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 0cadc575d7..2b4337a909 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -163,6 +163,7 @@ public class FragmentCompose extends FragmentBase {
     private ImageButton ibCcBcc;
     private RecyclerView rvAttachment;
     private TextView tvNoInternetAttachments;
+    private TextView tvUnusedInlineImages;
     private EditTextCompose etBody;
     private TextView tvNoInternet;
     private TextView tvSignature;
@@ -259,6 +260,7 @@ public class FragmentCompose extends FragmentBase {
         ibCcBcc = view.findViewById(R.id.ivCcBcc);
         rvAttachment = view.findViewById(R.id.rvAttachment);
         tvNoInternetAttachments = view.findViewById(R.id.tvNoInternetAttachments);
+        tvUnusedInlineImages = view.findViewById(R.id.tvUnusedInlineImages);
         etBody = view.findViewById(R.id.etBody);
         tvNoInternet = view.findViewById(R.id.tvNoInternet);
         tvSignature = view.findViewById(R.id.tvSignature);
@@ -649,6 +651,7 @@ public class FragmentCompose extends FragmentBase {
         rvAttachment.setAdapter(adapter);
 
         tvNoInternetAttachments.setVisibility(View.GONE);
+        tvUnusedInlineImages.setVisibility(View.GONE);
 
         pgpService = new OpenPgpServiceConnection(getContext(), "org.sufficientlysecure.keychain");
         pgpService.bindToService();
@@ -2568,11 +2571,14 @@ public class FragmentCompose extends FragmentBase {
 
                             int available = 0;
                             boolean downloading = false;
+                            boolean inline_images = false;
                             for (EntityAttachment attachment : attachments) {
                                 if (attachment.available)
                                     available++;
                                 if (attachment.progress != null)
                                     downloading = true;
+                                if (attachment.isInline() && attachment.isImage())
+                                    inline_images = true;
                             }
 
                             Log.i("Attachments=" + attachments.size() +
@@ -2586,6 +2592,8 @@ public class FragmentCompose extends FragmentBase {
 
                             rvAttachment.setTag(downloading);
                             checkInternet();
+
+                            tvUnusedInlineImages.setVisibility(inline_images ? View.VISIBLE : View.GONE);
                         }
                     });
 
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 77b0ee603f..2826e87e5d 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -224,6 +224,17 @@
                     app:layout_constraintStart_toStartOf="@id/rvAttachment"
                     app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
 
+                <TextView
+                    android:id="@+id/tvUnusedInlineImages"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/title_unused_inline"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    app:layout_constraintEnd_toEndOf="@id/rvAttachment"
+                    app:layout_constraintStart_toStartOf="@id/rvAttachment"
+                    app:layout_constraintTop_toBottomOf="@id/tvNoInternetAttachments" />
+
                 <View
                     android:id="@+id/vSeparator"
                     android:layout_width="0dp"
@@ -232,7 +243,7 @@
                     android:background="?attr/colorSeparator"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvNoInternetAttachments" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvUnusedInlineImages" />
 
                 <eu.faircode.email.EditTextCompose
                     android:id="@+id/etBody"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index edcc142bef..4a42f94e35 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -582,6 +582,7 @@
     <string name="title_no_folder">Folder does not exist</string>
     <string name="title_no_format">The originally received message will be included</string>
     <string name="title_no_image">Image could not be decoded</string>
+    <string name="title_unused_inline">Unused inline images will be removed on save/send</string>
     <string name="title_accross_remark">Messages moved across accounts will be downloaded again resulting in extra data usage</string>
     <string name="title_raw_saved">Raw message saved</string>
     <string name="title_attachment_saved">Attachment saved</string>