Merge branch 'trz/rebase' into trz/merge_1.11.1

1 files changed, 10 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index f9d8f508..073cc849 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -432,7 +432,10 @@ public class MessageParser extends AbstractParser implements
 						account.activateGracePeriod();
 					}
 				} else {
-					message.markUnread();
+					// only not mam messages should be marked as unread
+					if (query == null) {
+						message.markUnread();
+					}
 				}
 			}
 
@@ -454,17 +457,20 @@ public class MessageParser extends AbstractParser implements
 			if (message.getEncryption() == Message.ENCRYPTION_NONE || !ConversationsPlusPreferences.dontSaveEncrypted()) {
 				mXmppConnectionService.databaseBackend.createMessage(message);
 			}
-			final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager();
 			if (message.trusted()
                     && message.treatAsDownloadable() != Message.Decision.NEVER
                     && ConversationsPlusPreferences.autoAcceptFileSize() > 0
                     && ConversationsPlusPreferences.autoDownloadFileLink()) {
-				manager.createNewDownloadConnection(message);
+				this.mXmppConnectionService.getHttpConnectionManager().createNewDownloadConnection(message);
 			} else {
 				if (query == null) {
 					mXmppConnectionService.getNotificationService().push(message);
 				} else if (query.getWith() == null) { // mam catchup
-					mXmppConnectionService.getNotificationService().pushFromBacklog(message);
+					/*
+					Like suggested in https://bugs.thedevstack.de/task/156 user should be notified
+					in some other way of loaded messages.
+					 */
+					// mXmppConnectionService.getNotificationService().pushFromBacklog(message);
 				}
 			}
 		} else if (!packet.hasChild("body")){ //no body