From d1804d80a7a31fdc6705b574d3cc4c13ab10142f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 21 Mar 2020 08:56:52 +0100
Subject: [PATCH] Added hint

---
 .../main/java/eu/faircode/email/ActivitySetup.java |  4 +++-
 app/src/main/res/layout/dialog_password.xml        | 14 ++++++++++++--
 app/src/main/res/values/strings.xml                |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 08f494739e..46fcacdb52 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -1310,7 +1310,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
             View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_password, null);
             etPassword1 = dview.findViewById(R.id.tilPassword1);
             etPassword2 = dview.findViewById(R.id.tilPassword2);
-            TextView tvImportHint = dview.findViewById(R.id.tvImporthint);
+            TextView tvExportHint = dview.findViewById(R.id.tvExportHint);
+            TextView tvImportHint = dview.findViewById(R.id.tvImportHint);
 
             if (savedInstanceState != null) {
                 etPassword1.getEditText().setText(savedInstanceState.getString("fair:password1"));
@@ -1318,6 +1319,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
             }
 
             etPassword2.setVisibility(export ? View.VISIBLE : View.GONE);
+            tvExportHint.setVisibility(export ? View.VISIBLE : View.GONE);
             tvImportHint.setVisibility(export ? View.GONE : View.VISIBLE);
 
             return new AlertDialog.Builder(getContext())
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index 8b37bdfb4e..46e1371f41 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -47,12 +47,22 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <eu.faircode.email.FixedTextView
-        android:id="@+id/tvImporthint"
+        android:id="@+id/tvExportHint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/title_setup_export_do"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
+
+    <eu.faircode.email.FixedTextView
+        android:id="@+id/tvImportHint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
         android:text="@string/title_setup_import_do"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
+        app:layout_constraintTop_toBottomOf="@id/tvExportHint" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72b7dd78d8..342149fa91 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -198,6 +198,7 @@
 
     <string name="title_setup_export">Export settings</string>
     <string name="title_setup_import">Import settings</string>
+    <string name="title_setup_export_do">Gmail accounts linked to on-device Google accounts cannot be exported</string>
     <string name="title_setup_import_do">Imported accounts will be added without overwriting any existing ones</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_chars">Password contains control or whitespace characters</string>