diff options
| author | lookshe <github@lookshe.org> | 2015-08-16 18:45:08 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-08-16 18:45:08 +0200 |
| commit | 89b28a496542b1995f60efb6b8937d11adf8e425 (patch) | |
| tree | 2039e26dd5d3fdd8ce3ce277ff1bff8324f32f6e /src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java | |
| parent | a76de90fe7a53220e9358d38fa7b47b63f7694fe (diff) | |
| parent | 0321ebb7a6785b4673376f9e6458e41dd96b2230 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java b/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java index 52d7e2a2..563a7d67 100644 --- a/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java @@ -442,7 +442,7 @@ public class NotificationService { return PendingIntent.getService(mXmppConnectionService,0,intent,PendingIntent.FLAG_UPDATE_CURRENT); } - private boolean wasHighlightedOrPrivate(final Message message) { + public boolean wasHighlightedOrPrivate(final Message message) { final String nick = message.getConversation().getMucOptions().getActualNick(); final Pattern highlight = generateNickHighlightPattern(nick); if (message.getBody() == null || nick == null) { |