Merge branch 'mkirk/fix-unread-badge'

8 years ago · 2fc2c74fb6
parent 544dec1af8 dbad3b4f8d
commit 2fc2c74fb6
2 changed files with 1 additions and 2 deletions
--- a/Podfile.lock
+++ b/Podfile.lock
@ -134,7 +134,7 @@ CHECKOUT OPTIONS:
    :commit: 521686c112bbae7a762f85d52b1e41eeb1760772
    :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
  SignalServiceKit:
-    :commit: 85fe68d3c4f4419856dc8d309a15efa04a1d97c8
+    :commit: 04ef06ce95d553116d6b53984f0dcf9429ab78f4
    :git: https://github.com/WhisperSystems/SignalServiceKit.git
  SocketRocket:
    :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
--- a/Signal/src/ViewControllers/SignalsViewController.m
+++ b/Signal/src/ViewControllers/SignalsViewController.m
@ -603,7 +603,6 @@
    [_segmentedControl setTitle:unreadString forSegmentAtIndex:0];
    [_segmentedControl.superview setNeedsLayout];
    [_segmentedControl reloadInputViews];
-    [[UIApplication sharedApplication] setApplicationIconBadgeNumber:badgeNumber.integerValue];

    return badgeNumber;
 }