From 0bb3ae37f0762ad264a4b98b3ebc4753017441af Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Jan 2016 14:41:55 +0100
Subject: show icon in conversations overview when notifications are disabled

---
 .../ic_notifications_grey600_24dp.png              | Bin 0 -> 364 bytes
 .../ic_notifications_off_grey600_24dp.png          | Bin 0 -> 462 bytes
 .../ic_notifications_paused_grey600_24dp.png       | Bin 0 -> 440 bytes
 .../ic_notifications_grey600_24dp.png              | Bin 0 -> 276 bytes
 .../ic_notifications_off_grey600_24dp.png          | Bin 0 -> 336 bytes
 .../ic_notifications_paused_grey600_24dp.png       | Bin 0 -> 323 bytes
 .../ic_notifications_grey600_24dp.png              | Bin 0 -> 469 bytes
 .../ic_notifications_off_grey600_24dp.png          | Bin 0 -> 485 bytes
 .../ic_notifications_paused_grey600_24dp.png       | Bin 0 -> 482 bytes
 .../ic_notifications_grey600_24dp.png              | Bin 0 -> 630 bytes
 .../ic_notifications_off_grey600_24dp.png          | Bin 0 -> 697 bytes
 .../ic_notifications_paused_grey600_24dp.png       | Bin 0 -> 790 bytes
 .../ic_notifications_grey600_24dp.png              | Bin 0 -> 777 bytes
 .../ic_notifications_off_grey600_24dp.png          | Bin 0 -> 990 bytes
 .../ic_notifications_paused_grey600_24dp.png       | Bin 0 -> 972 bytes
 src/main/res/layout/conversation_list_row.xml      | 173 ++++++++++++---------
 16 files changed, 97 insertions(+), 76 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png

(limited to 'src/main/res')

diff --git a/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png
new file mode 100644
index 000000000..96b329c4a
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png
new file mode 100644
index 000000000..09ebc5d25
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png
new file mode 100644
index 000000000..e92d43acf
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png
new file mode 100644
index 000000000..d6c20c203
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png
new file mode 100644
index 000000000..af3b63215
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png
new file mode 100644
index 000000000..9d6308d2c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png
new file mode 100644
index 000000000..d441dc7c9
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png
new file mode 100644
index 000000000..aef303a0d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png
new file mode 100644
index 000000000..c68bedd38
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png
new file mode 100644
index 000000000..7d58d25d8
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png
new file mode 100644
index 000000000..e627b30a8
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png
new file mode 100644
index 000000000..e38f52179
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png
new file mode 100644
index 000000000..98dff2f3c
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png
new file mode 100644
index 000000000..ab65f4b22
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png
new file mode 100644
index 000000000..53162e569
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png differ
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 7321b0f66..984073b3e 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,88 +1,109 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			 xmlns:app="http://schemas.android.com/apk/res-auto"
-			 android:layout_width="fill_parent"
-			 android:layout_height="wrap_content"
-			 android:descendantFocusability="blocksDescendants">
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:descendantFocusability="blocksDescendants">
 
-	<View
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:background="@color/primary"/>
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/primary"/>
 
-	<FrameLayout
-		android:id="@+id/swipeable_item"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:background="@color/grey50">
+    <FrameLayout
+        android:id="@+id/swipeable_item"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/grey50">
 
-	<RelativeLayout
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:background="?android:selectableItemBackground"
-		android:orientation="horizontal"
-		android:padding="8dp" >
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:orientation="horizontal"
+            android:padding="8dp">
 
-		<com.makeramen.roundedimageview.RoundedImageView
-			android:id="@+id/conversation_image"
-			android:layout_width="56dp"
-			android:layout_height="56dp"
-			android:layout_alignParentLeft="true"
-			android:scaleType="centerCrop"
-			app:riv_corner_radius="2dp" />
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/conversation_image"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_alignParentLeft="true"
+                android:scaleType="centerCrop"
+                app:riv_corner_radius="2dp"/>
 
-		<RelativeLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_centerVertical="true"
-			android:layout_toRightOf="@+id/conversation_image"
-			android:paddingLeft="8dp" >
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/conversation_image"
+                android:paddingLeft="8dp">
 
-			<TextView
-				android:id="@+id/conversation_name"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignLeft="@+id/conversation_lastwrapper"
-				android:layout_toLeftOf="@+id/conversation_lastupdate"
-				android:singleLine="true"
-				android:textColor="@color/black87"
-				android:textSize="?attr/TextSizeHeadline"
-				android:typeface="sans" />
+                <TextView
+                    android:id="@+id/conversation_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignLeft="@+id/conversation_lastwrapper"
+                    android:layout_toLeftOf="@+id/conversation_lastupdate"
+                    android:paddingRight="4dp"
+                    android:singleLine="true"
+                    android:text="Awesome groupchat"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:typeface="sans"/>
 
-			<LinearLayout
-				android:id="@+id/conversation_lastwrapper"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/conversation_name"
-				android:orientation="vertical"
-				android:paddingTop="3dp" >
+                <RelativeLayout
+                    android:id="@+id/conversation_lastwrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/conversation_name"
+                    android:layout_marginTop="4dp">
 
-				<TextView
-					android:id="@+id/conversation_lastmsg"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:scrollHorizontally="false"
-					android:singleLine="true"
-					android:textColor="@color/black87"
-					android:textSize="?attr/TextSizeBody" />
+                    <LinearLayout android:layout_width="match_parent"
+                                  android:layout_height="wrap_content"
+                                  android:layout_alignParentLeft="true"
+                                  android:layout_centerVertical="true"
+                                  android:layout_toLeftOf="@+id/notification_status"
+                                  android:orientation="vertical">
+                        <TextView
+                            android:id="@+id/conversation_lastmsg"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:scrollHorizontally="false"
+                            android:singleLine="true"
+                            android:text="This is a placeholder text to show the last messages"
+                            android:textColor="@color/black87"
+                            android:textSize="?attr/TextSizeBody"/>
 
-				<ImageView
-					android:id="@+id/conversation_lastimage"
-					android:layout_width="fill_parent"
-					android:layout_height="36dp"
-					android:background="@color/black87"
-					android:scaleType="centerCrop" />
-			</LinearLayout>
+                        <com.makeramen.roundedimageview.RoundedImageView
+                            android:id="@+id/conversation_lastimage"
+                            android:layout_width="fill_parent"
+                            android:layout_height="36dp"
+                            android:background="@color/black87"
+                            android:scaleType="centerCrop"
+                            android:visibility="gone"
+                            app:riv_corner_radius="2dp"/>
+                    </LinearLayout>
+                    <ImageView
+                        android:id="@+id/notification_status"
+                        android:layout_width="16sp"
+                        android:layout_height="16sp"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="4dp"
+                        android:src="@drawable/ic_notifications_grey600_24dp"
+                        />
+                </RelativeLayout>
 
-			<TextView
-				android:id="@+id/conversation_lastupdate"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignBaseline="@+id/conversation_name"
-				android:layout_alignParentRight="true"
-				android:gravity="right"
-				android:textColor="@color/black54"
-				android:textSize="?attr/TextSizeInfo" />
-		</RelativeLayout>
-	</RelativeLayout>
-	</FrameLayout>
+                <TextView
+                    android:id="@+id/conversation_lastupdate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBaseline="@+id/conversation_name"
+                    android:layout_alignParentRight="true"
+                    android:gravity="right"
+                    android:text="23:42"
+                    android:textColor="@color/black54"
+                    android:textSize="?attr/TextSizeInfo"/>
+            </RelativeLayout>
+        </RelativeLayout>
+    </FrameLayout>
 </FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From a3e136b5504641f9782b9d94e35311dad19fbc1d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Jan 2016 21:30:46 +0100
Subject: show per conference notification settings in details activity

---
 .../ic_notifications_none_grey600_24dp.png         | Bin 0 -> 427 bytes
 .../ic_notifications_none_grey600_24dp.png         | Bin 0 -> 318 bytes
 .../ic_notifications_none_grey600_24dp.png         | Bin 0 -> 471 bytes
 .../ic_notifications_none_grey600_24dp.png         | Bin 0 -> 657 bytes
 .../ic_notifications_none_grey600_24dp.png         | Bin 0 -> 962 bytes
 src/main/res/layout/activity_muc_details.xml       |  27 +++++++++++++++++++++
 src/main/res/values/strings.xml                    |   6 +++--
 src/main/res/xml/preferences.xml                   |   6 -----
 8 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png

(limited to 'src/main/res')

diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png
new file mode 100644
index 000000000..6cd4dfc90
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png
new file mode 100644
index 000000000..3e8b0805c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png
new file mode 100644
index 000000000..1123cea43
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png
new file mode 100644
index 000000000..b8772d377
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png
new file mode 100644
index 000000000..ffdb15a83
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png differ
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 5f9424a9f..e7b11d9fe 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -108,6 +108,33 @@
 				android:src="?attr/icon_settings"/>
 				</RelativeLayout>
 
+			<RelativeLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content">
+				<TextView
+					android:id="@+id/notification_status_text"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/notify_on_all_messages"
+					android:layout_centerVertical="true"
+					android:textColor="@color/black87"
+					android:textSize="?attr/TextSizeBody"
+					android:layout_alignParentLeft="true"
+					android:layout_toLeftOf="@+id/notification_status_button"
+					/>
+				<ImageButton
+					android:id="@+id/notification_status_button"
+					style="?android:attr/buttonStyleSmall"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_horizontal"
+					android:layout_alignParentRight="true"
+					android:layout_centerVertical="true"
+					android:background="?android:selectableItemBackground"
+					android:padding="@dimen/image_button_padding"
+					android:src="@drawable/ic_notifications_grey600_24dp"/>
+			</RelativeLayout>
+
 			<TableLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3e4d2c68c..b0d630a96 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -111,8 +111,6 @@
 	<string name="pref_vibrate_summary">Also vibrate when a new message arrives</string>
 	<string name="pref_sound">Sound</string>
 	<string name="pref_sound_summary">Play ringtone with notification</string>
-	<string name="pref_conference_notifications">Notifications in Public Conferences</string>
-	<string name="pref_conference_notifications_summary">Always notify when a message arrives in a public conference instead of only when highlighted</string>
 	<string name="pref_notification_grace_period">Notification grace period</string>
 	<string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
 	<string name="pref_advanced_options">Advanced Options</string>
@@ -570,4 +568,8 @@
 	<string name="certificate_sha1">SHA1</string>
 	<string name="certicate_info_not_available">(Not available)</string>
 	<string name="certificate_not_found">No certificate found</string>
+	<string name="notify_on_all_messages">Notify on all messages</string>
+	<string name="notify_only_when_highlighted">Notify only when highlighted</string>
+	<string name="notify_never">Notifications disabled</string>
+	<string name="notify_paused">Notifications paused</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 16dc5eb99..34fb7c0a5 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -82,12 +82,6 @@
             android:summary="@string/pref_sound_summary"
             android:title="@string/pref_sound"/>
 
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:dependency="show_notification"
-            android:key="always_notify_in_conference"
-            android:summary="@string/pref_conference_notifications_summary"
-            android:title="@string/pref_conference_notifications"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_ui_options">
         <CheckBoxPreference
-- 
cgit v1.2.3


From 9dce42ac7f5270614fdc89282f2799fd92378dbe Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Jan 2016 21:35:20 +0100
Subject: don't show snackbar when notifications are disabled or paused

---
 src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/main/res')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index b0d630a96..049a5dc61 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -266,7 +266,6 @@
 	<string name="skip">Skip</string>
 	<string name="disable_notifications">Disable notifications</string>
 	<string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</string>
-	<string name="notifications_disabled">Notifications are disabled</string>
 	<string name="enable">Enable</string>
 	<string name="conference_requires_password">Conference requires password</string>
 	<string name="enter_password">Enter password</string>
-- 
cgit v1.2.3


From 4ab8fe13dea85e23f856bbe853fbf81af908edea Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 9 Jan 2016 16:17:39 +0100
Subject: let the user decide on whether or not to compress pictures

---
 src/main/res/values/arrays.xml   | 12 ++++++++++++
 src/main/res/values/strings.xml  |  6 +++++-
 src/main/res/xml/preferences.xml | 26 ++++++++++++++++----------
 3 files changed, 33 insertions(+), 11 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 5be352d1c..ca63a0f12 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -57,4 +57,16 @@
 		<item>voice</item>
 		<item>location</item>
 	</string-array>
+
+	<string-array name="picture_compression_values">
+		<item>never</item>
+		<item>auto</item>
+		<item>always</item>
+	</string-array>
+
+	<string-array name="picture_compression_entries">
+		<item>@string/never</item>
+		<item>@string/automatically</item>
+		<item>@string/always</item>
+	</string-array>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 049a5dc61..deffa64ea 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -287,7 +287,7 @@
 	<string name="pref_about_conversations_summary">Build and licensing information</string>
 	<string name="pref_about_message" translatable="false">
 			Conversations • the very last word in instant messaging.
-			\n\nCopyright © 2014-2015 Daniel Gultsch
+			\n\nCopyright © 2014-2016 Daniel Gultsch
 			\n\nThis program is free software: you can redistribute it and/or modify
 			it under the terms of the GNU General Public License as published by
 			the Free Software Foundation, either version 3 of the License, or
@@ -571,4 +571,8 @@
 	<string name="notify_only_when_highlighted">Notify only when highlighted</string>
 	<string name="notify_never">Notifications disabled</string>
 	<string name="notify_paused">Notifications paused</string>
+	<string name="pref_picture_compression">Compress Pictures</string>
+	<string name="pref_picture_compression_summary">Resize and compressed pictures</string>
+	<string name="always">Always</string>
+	<string name="automatically">Automatically</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 34fb7c0a5..b3afe0c3e 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -22,7 +22,13 @@
             android:key="auto_accept_file_size"
             android:summary="@string/pref_accept_files_summary"
             android:title="@string/pref_accept_files"/>
-
+        <ListPreference
+            android:defaultValue="auto"
+            android:entries="@array/picture_compression_entries"
+            android:entryValues="@array/picture_compression_values"
+            android:key="picture_compression"
+            android:summary="@string/pref_picture_compression_summary"
+            android:title="@string/pref_picture_compression"/>
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="confirm_messages"
@@ -92,8 +98,8 @@
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="use_white_background"
-            android:title="@string/pref_use_white_background"
-            android:summary="@string/pref_use_white_background_summary"/>
+            android:summary="@string/pref_use_white_background_summary"
+            android:title="@string/pref_use_white_background"/>
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="use_larger_font"
@@ -142,13 +148,13 @@
                     android:title="@string/pref_remove_trusted_certificates_title"/>
             </PreferenceCategory>
             <PreferenceCategory
-                android:title="@string/pref_connection_options"
-                android:key="connection_options">
+                android:key="connection_options"
+                android:title="@string/pref_connection_options">
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="use_tor"
-                    android:title="@string/pref_use_tor"
-                    android:summary="@string/pref_use_tor_summary"/>
+                    android:summary="@string/pref_use_tor_summary"
+                    android:title="@string/pref_use_tor"/>
             </PreferenceCategory>
             <PreferenceCategory android:title="@string/pref_input_options">
                 <CheckBoxPreference
@@ -186,9 +192,9 @@
                     android:summary="@string/pref_keep_foreground_service_summary"
                     android:title="@string/pref_keep_foreground_service"/>
                 <eu.siacs.conversations.ui.ExportLogsPreference
-                        android:key="export_logs"
-                        android:title="@string/pref_export_logs"
-                        android:summary="@string/pref_export_logs_summary"/>
+                    android:key="export_logs"
+                    android:summary="@string/pref_export_logs_summary"
+                    android:title="@string/pref_export_logs"/>
             </PreferenceCategory>
         </PreferenceScreen>
 
-- 
cgit v1.2.3