Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and distinguishes between image resizing and compressing/saving

3 files changed, 40 insertions, 19 deletions

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 29b2ec88..e6f6273e 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -505,4 +505,9 @@
   <string name="cplus_copied_to_clipboard">In Zwischenablage kopiert</string>
   <string name="pref_show_logcat_title">Zeige logcat Ausgabe</string>
   <string name="pref_show_logcat_summary">Zeigt die Ausgabe von logcat an. Hilfreich für die Fehlersuche.</string>
+  <string name="pref_file_transfer">Ordnername, um eingehnde Datein zu speichern</string>
+  <string name="pref_file_transfer_folder_summary">Unterordner des globalen Dateiordners, um eingehende Dateien zu speichern.</string>
+  <string name="pref_img_file_transfer">Ordnername, um eingehende Bilder zu speichern</string>
+  <string name="pref_img_file_transfer_summary">Unterordner des globalen Bilderordners, um eingehende Bilder zu speichern.</string>
+  <string name="pref_file_transfer_category">Dateiübertragung</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 96a89c9c..3431e831 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -538,4 +538,9 @@
     <string name="pref_show_logcat_title">Show logcat output</string>
     <string name="pref_show_logcat_summary">Shows the output of logcat. This is useful for debugging.</string>
     <string name="cplus_bugreport_jabberid">c+bugs@conference.thedevstack.de</string>
+    <string name="pref_file_transfer">Folder to save incoming files</string>
+    <string name="pref_file_transfer_folder_summary">This is the subdirectory for incoming files.</string>
+    <string name="pref_img_file_transfer">Folder to save incoming pictures</string>
+    <string name="pref_img_file_transfer_summary">This is the subdirectory in the pictures directory for incoming files.</string>
+    <string name="pref_file_transfer_category">File Transfer</string>
 </resources>
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