Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4

Conflicts:
	build.gradle
	src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
	src/main/java/eu/siacs/conversations/parser/PresenceParser.java
	src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/res/values/arrays.xml

4 files changed, 39 insertions, 15 deletions

diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index aa02e154..80166901 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -9,6 +9,15 @@
                 android:paddingRight="8dp"
                 android:paddingTop="5dp">
 
+    <Button
+        android:id="@+id/load_more_messages"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/load_more_messages"
+        android:textColor="@color/accent" android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true"/>
+
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/message_photo"
         android:layout_width="32dp"
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index b7a40418..9f06fc4c 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -2,35 +2,40 @@
 
     <item
         android:id="@+id/action_show_qr_code"
-        android:title="@string/show_qr_code"
-        android:showAsAction="never" />
+        android:showAsAction="never"
+        android:title="@string/show_qr_code"/>
 
     <item
         android:id="@+id/action_show_block_list"
-        android:title="@string/show_block_list"
-        android:showAsAction="never" />
+        android:showAsAction="never"
+        android:title="@string/show_block_list"/>
 
     <item
         android:id="@+id/action_renew_certificate"
+        android:showAsAction="never"
         android:title="@string/action_renew_certificate"
-        android:visible="false"
-        android:showAsAction="never" />
-        />
+        android:visible="false"/>
 
     <item
         android:id="@+id/action_server_info_show_more"
-        android:title="@string/server_info_show_more"
         android:checkable="true"
         android:checked="false"
-        android:showAsAction="never" />
+        android:showAsAction="never"
+        android:title="@string/server_info_show_more"/>
+
+    <item
+        android:id="@+id/action_mam_prefs"
+        android:title="@string/mam_prefs"/>
 
-	<item android:id="@+id/action_change_password_on_server"
-          android:title="@string/change_password"
-          android:showAsAction="never" />
+    <item
+        android:id="@+id/action_change_password_on_server"
+        android:showAsAction="never"
+        android:title="@string/change_password"/>
 
-    <item android:id="@+id/action_clear_devices"
-          android:title="@string/clear_other_devices"
-          android:showAsAction="never"/>
+    <item
+        android:id="@+id/action_clear_devices"
+        android:showAsAction="never"
+        android:title="@string/clear_other_devices"/>
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 24f8790c..f8028ea3 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -79,4 +79,10 @@
         <item>ALWAYS</item>
         <item>NEVER</item>
     </string-array>
+
+	<string-array name="mam_prefs">
+		<item>@string/never</item>
+		<item>@string/contacts</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 4caf0572..66fcb264 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -599,6 +599,9 @@
 	<string name="action_add_account_with_certificate">Add account with certificate</string>
 	<string name="unable_to_parse_certificate">Unable to parse certificate</string>
 	<string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string>
+	<string name="mam_prefs">Archiving preferences</string>
+	<string name="fetching_mam_prefs">Fetching archiving preferences. Please wait…</string>
+	<string name="unable_to_fetch_mam_prefs">Unable to fetch archiving preferences</string>
 	<string name="captcha_ocr">Captcha text</string>
 	<string name="captcha_required">Captcha required</string>
 	<string name="captcha_hint">enter the text from the image</string>
@@ -621,6 +624,7 @@
 		<item quantity="one">%d message</item>
 		<item quantity="other">%d messages</item>
 	</plurals>
+	<string name="load_more_messages">Load more messages</string>
 	<string name="shared_file_with_x">Shared file with %s</string>
 	<string name="shared_image_with_x">Shared image with %s</string>
 	<string name="no_storage_permission">Conversations need access to external storage</string>