From c26335f3e366110366eb89025a42875bcb7840a9 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Wed, 16 Dec 2015 00:53:04 +0100
Subject: Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil
 and distinguishes between image resizing and compressing/saving

---
 src/main/res/xml/preferences.xml | 49 ++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 19 deletions(-)

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

diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index a90385bc..0232fe02 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -17,6 +17,26 @@
             android:summary="@string/pref_xmpp_resource_summary"
             android:title="@string/pref_xmpp_resource" />
 
+        <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="false"
+            android:key="chat_states"
+            android:summary="@string/pref_chat_states_summary"
+            android:title="@string/pref_chat_states" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="parse_emoticons"
+            android:summary="@string/pref_parse_emoticons_summary"
+            android:title="@string/pref_parse_emoticons"/>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/pref_file_transfer_category">
         <PreferenceScreen
             android:summary="@string/pref_accept_files_summary"
             android:title="@string/pref_accept_files">
@@ -42,6 +62,16 @@
                 android:title="@string/pref_accept_files_download" />
 
         </PreferenceScreen>
+        <EditTextPreference
+            android:title="@string/pref_img_file_transfer"
+            android:summary="@string/pref_file_transfer_folder_summary"
+            android:key="file_transfer_folder"
+            android:defaultValue="Conversations+"/>
+        <EditTextPreference
+            android:title="@string/pref_file_transfer"
+            android:summary="@string/pref_img_file_transfer_summary"
+            android:key="img_transfer_folder"
+            android:defaultValue="Conversations+"/>
 
         <ListPreference
             android:defaultValue="ASK"
@@ -50,25 +80,6 @@
             android:key="resize_picture"
             android:summary="@string/pref_resize_picture_summary"
             android:title="@string/pref_resize_picture"/>
-
-        <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="false"
-            android:key="chat_states"
-            android:summary="@string/pref_chat_states_summary"
-            android:title="@string/pref_chat_states" />
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="parse_emoticons"
-            android:summary="@string/pref_parse_emoticons_summary"
-            android:title="@string/pref_parse_emoticons"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_notification_settings" >
         <PreferenceScreen
-- 
cgit v1.2.3