From 9cf16afc1213196e0237cad5e133574d7bfb7bc3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 6 Jan 2024 17:06:06 +0100
Subject: [PATCH] Added DNSSEC remark

---
 app/src/main/res/layout/fragment_account.xml  | 14 +++++++++++++-
 app/src/main/res/layout/fragment_identity.xml | 14 +++++++++++++-
 app/src/main/res/layout/fragment_pop.xml      | 14 +++++++++++++-
 app/src/main/res/values/strings.xml           |  3 ++-
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 10a263ced3..bdccd13609 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -144,6 +144,18 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvImap" />
 
+                <TextView
+                    android:id="@+id/tvDnsRemark"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/title_dnssec_remark"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/cbDnsSec" />
+
                 <TextView
                     android:id="@+id/tvHost"
                     android:layout_width="wrap_content"
@@ -154,7 +166,7 @@
                     android:textColor="?android:textColorPrimary"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/cbDnsSec" />
+                    app:layout_constraintTop_toBottomOf="@id/tvDnsRemark" />
 
                 <eu.faircode.email.EditTextPlain
                     android:id="@+id/etHost"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index ce34e7c5b6..2e5cdf4b1c 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -294,6 +294,18 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSmtp" />
 
+                <TextView
+                    android:id="@+id/tvDnsRemark"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/title_dnssec_remark"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/cbDnsSec" />
+
                 <TextView
                     android:id="@+id/tvHost"
                     android:layout_width="wrap_content"
@@ -304,7 +316,7 @@
                     android:textColor="?android:textColorPrimary"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/cbDnsSec" />
+                    app:layout_constraintTop_toBottomOf="@id/tvDnsRemark" />
 
                 <eu.faircode.email.EditTextPlain
                     android:id="@+id/etHost"
diff --git a/app/src/main/res/layout/fragment_pop.xml b/app/src/main/res/layout/fragment_pop.xml
index b80517430f..e7f28f390c 100644
--- a/app/src/main/res/layout/fragment_pop.xml
+++ b/app/src/main/res/layout/fragment_pop.xml
@@ -85,6 +85,18 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvPop" />
 
+                <TextView
+                    android:id="@+id/tvDnsRemark"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/title_dnssec_remark"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/cbDnsSec" />
+
                 <TextView
                     android:id="@+id/tvHost"
                     android:layout_width="wrap_content"
@@ -95,7 +107,7 @@
                     android:textColor="?android:textColorPrimary"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/cbDnsSec" />
+                    app:layout_constraintTop_toBottomOf="@id/tvDnsRemark" />
 
                 <eu.faircode.email.EditTextPlain
                     android:id="@+id/etHost"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 385adff6ea..7e8f75abc7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1188,6 +1188,7 @@
     <string name="title_provider">Provider</string>
     <string name="title_custom">Custom</string>
     <string name="title_dnssec">Enforce DNSSEC</string>
+    <string name="title_dnssec_remark">Only a limited number of DNS servers support DNSSEC</string>
     <string name="title_host">Host name</string>
     <string name="title_encryption">Encryption</string>
     <string name="title_encryption_ssl" translatable="false">SSL/TLS</string>
@@ -1196,7 +1197,7 @@
     <string name="title_allow_insecure">Allow insecure connections</string>
     <string name="title_insecure_remark">Insecure connections should only be allowed on trusted networks and never on public networks</string>
     <string name="title_dane">Enforce DANE</string>
-    <string name="title_dane_remark">Only some email servers support DANE and only a limited number of DNS servers support DNSSEC</string>
+    <string name="title_dane_remark">Only some email providers support DANE</string>
     <string name="title_notify_remark">You can enable this for account specific notifications</string>
     <string name="title_port">Port number</string>
     <string name="title_user">User name</string>