diff options
author | Christian S <christian@pix-art.de> | 2016-03-27 20:08:43 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-03-27 20:08:43 +0200 |
commit | 2b32a82a13d5f9975417eff0571fa2468b047e97 (patch) | |
tree | 42c38495e6a37fef522e0225bb8b9926c68150b2 | |
parent | e0777ad51e87324cf3bb9e025723dae77b9ecb8d (diff) | |
parent | 083738f370f762d717278619ba97742d21bed575 (diff) |
Merge remote-tracking branch 'refs/remotes/origin/patch-2' into development
-rw-r--r-- | build.gradle | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 7beb77dd0..90239457c 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ dependencies { compile 'com.google.zxing:android-integration:3.2.1' compile 'de.measite.minidns:minidns:0.1.7' compile 'de.timroes.android:EnhancedListView:0.3.4' - compile 'me.leolin:ShortcutBadger:1.1.3@aar' + compile 'me.leolin:ShortcutBadger:1.1.4@aar' compile 'com.kyleduo.switchbutton:library:1.2.8' compile 'org.whispersystems:axolotl-android:1.3.4' compile 'com.makeramen:roundedimageview:2.2.0' diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 277f0667b..a1e7d389b 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2809,9 +2809,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa if (unreadCount != count) { Log.d(Config.LOGTAG, "update unread count to " + count); if (count > 0) { - ShortcutBadger.with(getApplicationContext()).count(count); + ShortcutBadger.applyCount(context, count); } else { - ShortcutBadger.with(getApplicationContext()).remove(); + ShortcutBadger.removeCount(context); } unreadCount = count; } |