From b95bdbe791a8b7609b46ec5b9c089b2dc2461314 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 26 Feb 2018 19:38:19 +0100
Subject: implement multi accounts via expert settings

---
 src/main/res/layout/password.xml      | 12 ++++++++++--
 src/main/res/menu/change_presence.xml |  5 -----
 src/main/res/menu/verify_otr.xml      |  5 -----
 src/main/res/values/defaults.xml      |  1 +
 src/main/res/values/strings.xml       |  2 ++
 src/main/res/xml/preferences.xml      |  5 +++++
 6 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/password.xml b/src/main/res/layout/password.xml
index db8d82505..2037f3787 100644
--- a/src/main/res/layout/password.xml
+++ b/src/main/res/layout/password.xml
@@ -5,9 +5,17 @@
     android:layout_height="match_parent">
 
     <EditText
+        android:id="@+id/password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="textPassword"
         android:hint="@string/account_settings_password"
-        android:id="@+id/password" />
+        android:inputType="textPassword" />
+
+    <EditText
+        android:id="@+id/confirm_password"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/confirm_password"
+        android:inputType="textPassword"
+        android:visibility="gone"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/change_presence.xml b/src/main/res/menu/change_presence.xml
index 1a320d59e..34af0a679 100644
--- a/src/main/res/menu/change_presence.xml
+++ b/src/main/res/menu/change_presence.xml
@@ -4,11 +4,6 @@
         android:title="@string/account_details"
         android:showAsAction="always"
         android:icon="@drawable/ic_account_box_white_24dp" />
-    <item
-        android:id="@+id/action_accounts"
-        android:orderInCategory="90"
-        android:showAsAction="never"
-        android:title="@string/action_accounts" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml
index 17b6562c2..7dadffce8 100644
--- a/src/main/res/menu/verify_otr.xml
+++ b/src/main/res/menu/verify_otr.xml
@@ -6,11 +6,6 @@
         android:title="@string/show_qr_code"
         android:showAsAction="never" />
 
-    <item
-        android:id="@+id/action_accounts"
-        android:orderInCategory="90"
-        android:showAsAction="never"
-        android:title="@string/action_accounts" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 093360b85..f82b5f21e 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -101,5 +101,6 @@
     <bool name="show_foreground_service">true</bool>
     <bool name="warn_unencrypted_chat">true</bool>
     <bool name="use_bundled_emoji">true</bool>
+    <bool name="enable_multi_accounts">false</bool>
 </resources>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4d3cd5162..16fe709ee 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -761,4 +761,6 @@
     <string name="snooze">Snooze</string>
     <string name="huawei_protected_apps">Protected Apps</string>
     <string name="huawei_protected_apps_summary">To keep receiving notifications, even when the screen is turned off, you need to add Pix-Art Messenger to the list of protected apps.</string>
+    <string name="pref_enable_multi_accounts_title">Enable multiple accounts</string>
+    <string name="pref_enable_multi_accounts_summary">You want to use multiple accounts, so you have to set a password for daily backups.</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 109d61239..0343d1171 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -269,6 +269,11 @@
                     android:targetClass="com.huawei.systemmanager.optimize.process.ProtectActivity"
                     android:targetPackage="com.huawei.systemmanager" />
             </PreferenceScreen>
+            <CheckBoxPreference
+                android:defaultValue="@bool/enable_multi_accounts"
+                android:key="enable_multi_accounts"
+                android:title="@string/pref_enable_multi_accounts_title"
+                android:summary="@string/pref_enable_multi_accounts_summary" />
         </PreferenceCategory>
         <PreferenceCategory android:title="@string/pref_ui_options">
             <CheckBoxPreference
-- 
cgit v1.2.3