From 899a39cbf74dcd35f2a62e1fd6499de4ba6193fd Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Tue, 9 Feb 2016 21:57:44 +0100
Subject: implementation hint for FS#96 added

---
 src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java b/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java
index e70e8e43..e36007d7 100644
--- a/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/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");
 	}
 
-- 
cgit v1.2.3


From 72114d732427266024cdd6e27cd8d1aa60afae2f Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Tue, 9 Feb 2016 22:08:43 +0100
Subject: Fixes FS#135: condition NOT message.isRead() added to check if
 notification should be shown for a message

---
 .../java/de/thedevstack/conversationsplus/parser/MessageParser.java     | 2 +-
 .../de/thedevstack/conversationsplus/services/NotificationService.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
index 85c38e12..8c7d8efd 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
@@ -376,7 +376,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/de/thedevstack/conversationsplus/services/NotificationService.java b/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
index f3ef271c..b02b4d82 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/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();
 
-- 
cgit v1.2.3