From 969044b1133fa2fd82d209953a1970a2a5b2eb97 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 3 Jan 2015 00:11:02 +0100 Subject: [PATCH] migrated change password into separate activity --- src/main/AndroidManifest.xml | 3 + .../ui/ChangePasswordActivity.java | 107 ++++++++++++++++++ .../conversations/ui/EditAccountActivity.java | 99 ++++------------ src/main/res/layout/activity_edit_account.xml | 9 -- src/main/res/menu/editaccount.xml | 4 + src/main/res/values/strings.xml | 4 + 6 files changed, 138 insertions(+), 88 deletions(-) create mode 100644 src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 5662e626b..f3d58d579 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -79,6 +79,9 @@ + - - + + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 1d1f609d3..ebb95278f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -399,4 +399,8 @@ Your hint should not be empty Your shared secret can not be empty Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those. + Change password + Current password + New password + Password should not be empty