From 19273a993c37a4f989faf326df03b9f396a5f1a5 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 9 Feb 2016 17:23:33 -0800
Subject: Add requirement for current user password when changing as non-admin

---
 app/src/main/res/layout/change_password.xml | 25 ++++++++++++++++++++++++-
 app/src/main/res/values/strings.xml         |  1 +
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/change_password.xml b/app/src/main/res/layout/change_password.xml
index d8043c05..68861b0b 100644
--- a/app/src/main/res/layout/change_password.xml
+++ b/app/src/main/res/layout/change_password.xml
@@ -4,7 +4,30 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	<LinearLayout
+		android:id="@+id/current_password_layout"
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/current_password_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/admin.change_password_current_label"
+			android:textColor="?android:textColorPrimary"/>
+		<EditText
+			android:id="@+id/current_password"
+			android:inputType="textPassword"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_marginLeft="4dp" />
+	</LinearLayout>
+
+	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6eac3c83..b4d6f41b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -524,6 +524,7 @@
 	<string name="admin.change_password">Change Password</string>
 	<string name="admin.change_password_success">Successfully changed password for %1$s</string>
 	<string name="admin.change_password_error">Failed to change password for %1$s</string>
+	<string name="admin.change_password_current_label">Current Password:</string>
 	<string name="admin.change_password_label">New Password:</string>
 	<string name="admin.change_password_invalid">Enter a valid password</string>
 	<string name="admin.delete_user">Delete User</string>
-- 
cgit v1.2.3