Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

3 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrService.java b/src/main/java/eu/siacs/conversations/crypto/OtrService.java
index 40915981..73ed06e8 100644
--- a/src/main/java/eu/siacs/conversations/crypto/OtrService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/OtrService.java
@@ -257,6 +257,7 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
 	@Override
 	public void unreadableMessageReceived(SessionID session) throws OtrException {
 		Logging.d(Config.LOGTAG,"unreadable message received");
+		// Hier update des contents fuer FS#96
 		sendOtrErrorMessage(session, "You sent me an unreadable OTR-encrypted message");
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 53847dc3..10d78bac 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -377,7 +377,7 @@ public class MessageParser extends AbstractParser implements
                     && ConversationsPlusPreferences.autoDownloadFileLink()
                     && mXmppConnectionService.isDownloadAllowedInConnection()) {
 				manager.createNewDownloadConnection(message);
-			} else if (!message.isRead()) {
+			} else {
 				mXmppConnectionService.getNotificationService().push(message);
 			}
 		} else { //no body
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index fe78bfcc..8245f0df 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -126,10 +126,10 @@ public class NotificationService {
 	}
 
 	public void push(final Message message) {
-		mXmppConnectionService.updateUnreadCountBadge();
 		if (!notify(message)) {
 			return;
 		}
+        mXmppConnectionService.updateUnreadCountBadge();
 
 		final boolean isScreenOn = isInteractive();