changed received and read confirmation setting to one list and put it to settings class

4 files changed, 83 insertions, 68 deletions

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 9b48bfd5..ccb3c990 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -119,10 +119,11 @@
     <string name="pref_advanced_options">Erweiterte Optionen</string>
     <string name="pref_never_send_crash">Sende niemals Absturzberichte</string>
     <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string>
-  <string name="pref_confirm_messages">Empfangsbestätigung senden</string>
-  <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen hast</string>
-    <string name="pref_confirm_read_messages">Lesebestätigung senden</string>
-    <string name="pref_confirm_read_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht gelesen hast</string>
+  <string name="pref_confirm_messages">Lese- und Empfangsbestätigung senden</string>
+  <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen oder gelesen hast</string>
+    <string name="pref_confirm_messages_none">Keine Bestätigungen</string>
+    <string name="pref_confirm_messages_received">Nur Empfangsbestätigung</string>
+    <string name="pref_confirm_messages_read_and_received">Lese- und Empfangsbestätigung</string>
     <string name="pref_ui_options">Benutzeroberfläche</string>
     <string name="pref_parse_emoticons">Smilies ersetzen</string>
     <string name="pref_parse_emoticons_summary">Zeige Smilie-Bilder anstelle von Emoticons.</string>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index c413a3c4..942117d8 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -40,4 +40,16 @@
 		<item>-1</item>
 	</integer-array>
 
+    <string-array name="confirm_strings">
+        <item>@string/pref_confirm_messages_none</item>
+        <item>@string/pref_confirm_messages_received</item>
+        <item>@string/pref_confirm_messages_read_and_received</item>
+    </string-array>
+
+    <string-array name="confirm_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 03c1386f..d454cc1f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -122,9 +122,10 @@
     <string name="pref_never_send_crash">Never send crash reports</string>
     <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
     <string name="pref_confirm_messages">Confirm Messages</string>
-    <string name="pref_confirm_messages_summary">Let your contact know when you have received a message</string>
-    <string name="pref_confirm_read_messages">Confirm Read Messages</string>
-    <string name="pref_confirm_read_messages_summary">Let your contact know when you have read a message</string>
+    <string name="pref_confirm_messages_summary">Let your contact know when you have received or read a message</string>
+    <string name="pref_confirm_messages_none">No confirmation</string>
+    <string name="pref_confirm_messages_received">Confirmation for received message</string>
+    <string name="pref_confirm_messages_read_and_received">Confirmation for received and read message</string>
     <string name="pref_ui_options">UI Options</string>
     <string name="pref_parse_emoticons">Parse Emoticons</string>
     <string name="pref_parse_emoticons_summary">Replace emoticons with smilies.</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 72b6a7c8..9cf2ed93 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -43,19 +43,15 @@
 
         </PreferenceScreen>
 
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="confirm_messages"
+        <ListPreference
+            android:defaultValue="2"
+            android:entries="@array/confirm_strings"
+            android:entryValues="@array/confirm_values"
+            android:key="confirm_messages_list"
             android:summary="@string/pref_confirm_messages_summary"
             android:title="@string/pref_confirm_messages" />
 
         <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="confirm_read_message"
-            android:summary="@string/pref_confirm_read_messages_summary"
-            android:title="@string/pref_confirm_read_messages" />
-
-        <CheckBoxPreference
             android:defaultValue="false"
             android:key="chat_states"
             android:summary="@string/pref_chat_states_summary"
@@ -64,57 +60,68 @@
             android:defaultValue="true"
             android:key="parse_emoticons"
             android:summary="@string/pref_parse_emoticons_summary"
-            android:title="Parse Emoticons"/>
+            android:title="@string/pref_parse_emoticons"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_notification_settings" >
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="show_notification"
-            android:summary="@string/pref_notifications_summary"
-            android:title="@string/pref_notifications" />
-          <PreferenceScreen
-            android:dependency="show_notification"
-            android:summary="@string/pref_quiet_hours_summary"
-            android:title="@string/title_pref_quiet_hours">
+        <PreferenceScreen
+            android:summary="@string/pref_notification_settings"
+            android:title="@string/pref_notifications" >
             <CheckBoxPreference
-              android:defaultValue="false"
-              android:key="enable_quiet_hours"
-              android:summary="@string/pref_quiet_hours_summary"
-              android:title="@string/title_pref_enable_quiet_hours" />
-            <eu.siacs.conversations.ui.TimePreference
-              android:dependency="enable_quiet_hours"
-              android:key="quiet_hours_start"
-              android:negativeButtonText="@string/cancel"
-              android:positiveButtonText="@string/set"
-              android:title="@string/title_pref_quiet_hours_start_time" />
-            <eu.siacs.conversations.ui.TimePreference
-              android:dependency="enable_quiet_hours"
-              android:key="quiet_hours_end"
-              android:negativeButtonText="@string/cancel"
-              android:positiveButtonText="@string/set"
-              android:title="@string/title_pref_quiet_hours_end_time" />
-          </PreferenceScreen>
-          <CheckBoxPreference
-            android:defaultValue="true"
-            android:dependency="show_notification"
-            android:key="vibrate_on_notification"
-            android:summary="@string/pref_vibrate_summary"
-            android:title="@string/pref_vibrate" />
+                android:defaultValue="true"
+                android:key="show_notification"
+                android:summary="@string/pref_notifications_summary"
+                android:title="@string/pref_notifications" />
+              <PreferenceScreen
+                android:dependency="show_notification"
+                android:summary="@string/pref_quiet_hours_summary"
+                android:title="@string/title_pref_quiet_hours">
+                <CheckBoxPreference
+                  android:defaultValue="false"
+                  android:key="enable_quiet_hours"
+                  android:summary="@string/pref_quiet_hours_summary"
+                  android:title="@string/title_pref_enable_quiet_hours" />
+                <eu.siacs.conversations.ui.TimePreference
+                  android:dependency="enable_quiet_hours"
+                  android:key="quiet_hours_start"
+                  android:negativeButtonText="@string/cancel"
+                  android:positiveButtonText="@string/set"
+                  android:title="@string/title_pref_quiet_hours_start_time" />
+                <eu.siacs.conversations.ui.TimePreference
+                  android:dependency="enable_quiet_hours"
+                  android:key="quiet_hours_end"
+                  android:negativeButtonText="@string/cancel"
+                  android:positiveButtonText="@string/set"
+                  android:title="@string/title_pref_quiet_hours_end_time" />
+              </PreferenceScreen>
+              <CheckBoxPreference
+                android:defaultValue="true"
+                android:dependency="show_notification"
+                android:key="vibrate_on_notification"
+                android:summary="@string/pref_vibrate_summary"
+                android:title="@string/pref_vibrate" />
 
-        <RingtonePreference
-            android:defaultValue="content://settings/system/notification_sound"
-            android:dependency="show_notification"
-            android:key="notification_ringtone"
-            android:ringtoneType="notification"
-            android:summary="@string/pref_sound_summary"
-            android:title="@string/pref_sound" />
+            <RingtonePreference
+                android:defaultValue="content://settings/system/notification_sound"
+                android:dependency="show_notification"
+                android:key="notification_ringtone"
+                android:ringtoneType="notification"
+                android:summary="@string/pref_sound_summary"
+                android:title="@string/pref_sound" />
 
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:dependency="show_notification"
-            android:key="always_notify_in_conference"
-            android:summary="@string/pref_conference_notifications_summary"
-            android:title="@string/pref_conference_notifications" />
+            <yuku.ambilwarna.widget.AmbilWarnaPreference
+                android:defaultValue="0xffffffff"
+                android:key="led_notify_color"
+                android:title="@string/pref_led_notification_color"
+                app:supportsAlpha="true"
+                android:summary="@string/pref_led_notification_color_summary"/>
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:dependency="show_notification"
+                android:key="always_notify_in_conference"
+                android:summary="@string/pref_conference_notifications_summary"
+                android:title="@string/pref_conference_notifications" />
+        </PreferenceScreen>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_ui_options" >
         <CheckBoxPreference
@@ -177,12 +184,6 @@
                     android:key="keep_foreground_service"
                     android:title="@string/pref_keep_foreground_service"
                     android:summary="@string/pref_keep_foreground_service_summary" />
-                <yuku.ambilwarna.widget.AmbilWarnaPreference
-                    android:defaultValue="0xffffffff"
-                    android:key="led_notify_color"
-                    android:title="@string/pref_led_notification_color"
-                    app:supportsAlpha="true"
-                    android:summary="@string/pref_led_notification_color_summary"/>
             </PreferenceCategory>
         </PreferenceScreen>