diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-02-09 22:13:35 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-02-09 22:13:35 +0100 |
commit | cec1b0f1f8d3976ab6a437ff4584ac039b64fa9a (patch) | |
tree | 7e3930f7cd0ab878f9aa3ef2df353c74890f103e /src/main/java | |
parent | e0219ae4cef0cd1a65e9727a02417de14caa67ff (diff) | |
parent | 72114d732427266024cdd6e27cd8d1aa60afae2f (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to '')
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(); |