Merge branch 'charlesmchen/notificationSoundsVsConcurrency'

9 years ago · f4a77f730f
parent e8a0cc08e6 bdfa435738
commit f4a77f730f
1 changed files with 27 additions and 26 deletions
--- a/Signal/src/environment/NotificationsManager.m
+++ b/Signal/src/environment/NotificationsManager.m
@ -310,8 +310,8 @@

 - (BOOL)shouldPlaySoundForNotification
 {
-    OWSAssert([NSThread isMainThread]);
-
+    @synchronized(self)
+    {
        // Play no more than 2 notification sounds in a given
        // five-second window.
        const CGFloat kNotificationWindowSeconds = 5.f;
@ -341,6 +341,7 @@
            DDLogDebug(@"Skipping sound for notification");
            return NO;
        }
+    }
 }

 #pragma mark - Util