From a47cda9a422d30a4552191c1450f3e95b4580586 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 23 May 2024 13:47:06 +0200
Subject: [PATCH] Added remark

---
 .../main/java/eu/faircode/email/AdapterMessage.java |  2 ++
 app/src/main/res/layout/dialog_show_full.xml        | 13 +++++++++++++
 app/src/main/res/layout/dialog_show_images.xml      | 13 +++++++++++++
 app/src/main/res/values/strings.xml                 |  1 +
 4 files changed, 29 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 1e9681dd03..bffbd59c21 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5593,6 +5593,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             CheckBox cbNotAgainDomain = dview.findViewById(R.id.cbNotAgainDomain);
             CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
             CheckBox cbNeverAgain = dview.findViewById(R.id.cbNeverAgain);
+            TextView tvNeverAgainHint = dview.findViewById(R.id.tvNeverAgainHint);
 
             if (junk) {
                 if (full)
@@ -5601,6 +5602,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 cbNotAgainDomain.setVisibility(View.GONE);
                 cbNotAgain.setVisibility(View.GONE);
                 cbNeverAgain.setVisibility(View.GONE);
+                tvNeverAgainHint.setVisibility(View.GONE);
             } else if (senders == null || senders.length == 0) {
                 cbNotAgainSender.setVisibility(View.GONE);
                 cbNotAgainDomain.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/dialog_show_full.xml b/app/src/main/res/layout/dialog_show_full.xml
index bb1edfb8eb..202499e8eb 100644
--- a/app/src/main/res/layout/dialog_show_full.xml
+++ b/app/src/main/res/layout/dialog_show_full.xml
@@ -113,6 +113,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
 
+        <TextView
+            android:id="@+id/tvNeverAgainHint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_undo_privacy"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbNeverAgain" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpTracking"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/dialog_show_images.xml b/app/src/main/res/layout/dialog_show_images.xml
index c9d26cb2a2..8fee36349f 100644
--- a/app/src/main/res/layout/dialog_show_images.xml
+++ b/app/src/main/res/layout/dialog_show_images.xml
@@ -90,6 +90,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
 
+        <TextView
+            android:id="@+id/tvNeverAgainHint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_undo_privacy"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbNeverAgain" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpTracking"
             android:layout_width="0dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 75100494aa..408cc3953b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2339,6 +2339,7 @@
     <string name="title_ask_what">Ask what to do</string>
     <string name="title_no_ask_again">Do not ask this again</string>
     <string name="title_no_ask_for_again">Do not ask this again for %1$s</string>
+    <string name="title_undo_privacy">This can be undone in the privacy-settings tab page</string>
     <string name="title_no_body">No message text found</string>
     <string name="title_large_body">This message is very large and this may cause problems!</string>
     <string name="title_no_charset">Unsupported encoding: %1$s</string>