From 4c7ae90b36a52df8d9d022a479ebf2357cad69d3 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Wed, 8 Mar 2017 18:46:12 +0000
Subject: [PATCH] Encryption setup page: add a note about why we are asking for
 an additional password.

---
 .../syncadapter/ui/setup/EncryptionDetailsFragment.java    | 4 ++++
 app/src/main/res/layout/login_encryption_details.xml       | 7 +++++++
 app/src/main/res/values/strings.xml                        | 1 +
 3 files changed, 12 insertions(+)

diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.java
index b043fd6f..e4cadee5 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.java
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.java
@@ -16,6 +16,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.etesync.syncadapter.Constants;
 import com.etesync.syncadapter.R;
 import com.etesync.syncadapter.ui.widget.EditPassword;
 
@@ -65,6 +66,9 @@ public class EncryptionDetailsFragment extends Fragment {
             }
         });
 
+        final TextView extra_details = (TextView) v.findViewById(R.id.encryption_extra_info);
+        extra_details.setText(getString(R.string.login_encryption_extra_info, Constants.faqUri.buildUpon().appendEncodedPath("#securing-etesync").build().toString()));
+
         return v;
     }
 
diff --git a/app/src/main/res/layout/login_encryption_details.xml b/app/src/main/res/layout/login_encryption_details.xml
index ed1414f1..f7862237 100644
--- a/app/src/main/res/layout/login_encryption_details.xml
+++ b/app/src/main/res/layout/login_encryption_details.xml
@@ -44,7 +44,14 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
                 android:text="@string/login_encryption_check_password"/>
+            <TextView
+                android:id="@+id/encryption_extra_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autoLink="web"
+                android:text="@string/login_encryption_extra_info"/>
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fb64214..9c18d796 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -109,6 +109,7 @@
     <string name="login_password">Password</string>
     <string name="login_encryption_password">Encryption Password</string>
     <string name="login_encryption_check_password">* Please double-check the password, as it can\'t be changed if wrong.</string>
+    <string name="login_encryption_extra_info">This password is used to encrypt your data, unlike the previous one, which is used to log into the service.\nYou are asked to choose a separate encryption password for security reasons. For more information, plesae refer to the FAQ at: %s</string>
     <string name="login_password_required">Password required</string>
     <string name="login_login">Log In</string>
     <string name="login_signup">Sign Up</string>