From 4b45b852a7ecd5c3252c2080ceeb26b3e973a9bd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Sep 2023 08:27:51 +0200
Subject: [PATCH] Added remark

---
 .../main/res/layout/fragment_options_encryption.xml | 13 ++++++++++++-
 app/src/main/res/values/strings.xml                 |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_options_encryption.xml b/app/src/main/res/layout/fragment_options_encryption.xml
index 9930abad20..36ef9ae51b 100644
--- a/app/src/main/res/layout/fragment_options_encryption.xml
+++ b/app/src/main/res/layout/fragment_options_encryption.xml
@@ -86,6 +86,17 @@
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionGeneral"
                     app:srcCompat="@drawable/twotone_info_24" />
 
+                <TextView
+                    android:id="@+id/tvDefaultMethod"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:text="@string/title_advanced_default_encryption"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/ibInfo" />
+
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swSign"
                     android:layout_width="0dp"
@@ -94,7 +105,7 @@
                     android:text="@string/title_advanced_sign_default"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ibInfo"
+                    app:layout_constraintTop_toBottomOf="@id/tvDefaultMethod"
                     app:switchPadding="12dp" />
 
                 <androidx.appcompat.widget.SwitchCompat
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa8b6d646c..6bc2324d82 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -774,6 +774,10 @@
     <string name="title_advanced_clear_all">Delete the app data</string>
     <string name="title_advanced_clear_all_remark">The app data will be irreversibly deleted!</string>
 
+    <string name="title_advanced_default_encryption">
+        The default encryption method (PGP or S/MIME) will be stored per identity after sending a signed or encrypted message.
+        The encryption method can be selected before sending in the send options dialog box (long press the send button).
+    </string>
     <string name="title_advanced_sign_default">Sign by default</string>
     <string name="title_advanced_encrypt_default">Encrypt by default</string>
     <string name="title_advanced_encrypt_auto">Automatically encrypt when all recipients\' keys are available</string>