arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-02 19:01:06 +00:00
Code Issues Releases Wiki Activity

Encryption setup page: add a note about why we are asking for an additional password.

Browse Source
This commit is contained in:
Tom Hacohen 2017-03-08 18:46:12 +00:00
parent 83fde4b81d
commit 4c7ae90b36
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/etesync/syncadapter/ui/setup/EncryptionDetailsFragment.java
View File

@ -16,6 +16,7 @@ import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R; import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.widget.EditPassword; 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; return v;
} }

7
app/src/main/res/layout/login_encryption_details.xml
View File

@ -44,7 +44,14 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="@string/login_encryption_check_password"/> 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> </LinearLayout>
</ScrollView> </ScrollView>

1
app/src/main/res/values/strings.xml
View File

@ -109,6 +109,7 @@
<string name="login_password">Password</string> <string name="login_password">Password</string>
<string name="login_encryption_password">Encryption 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_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_password_required">Password required</string>
<string name="login_login">Log In</string> <string name="login_login">Log In</string>
<string name="login_signup">Sign Up</string> <string name="login_signup">Sign Up</string>