Merge pull request #1264 from WhisperSystems/fix-audio-notification

Fix "message received" audio notification

Signal/src/Models/OWSErrorMessage.m

@@ -64,7 +64,7 @@
                      self.senderId,
                      self.senderDisplayName,
                      self.date,
-                     self.errorMessageType];
+                     (long)self.errorMessageType];
 }
 
 - (TSMessageAdapterType)messageType

Signal/src/Models/OWSInfoMessage.m

@@ -49,7 +49,7 @@
                      self.senderId,
                      self.senderDisplayName,
                      self.date,
-                     self.infoMessageType];
+                     (long)self.infoMessageType];
 }
 
 @end

Signal/src/environment/NotificationsManager.m

@@ -25,15 +25,17 @@
 
 @implementation NotificationsManager
 
-- (instancetype)init {
+- (instancetype)init
+{
     self = [super init];
 
-    if (self) {
-        NSURL *newMessageSound =
-            [NSURL URLWithString:[[NSBundle mainBundle] pathForResource:@"NewMessage" ofType:@"aifc"]];
-        self.newMessageSound = AudioServicesCreateSystemSoundID((__bridge CFURLRef)newMessageSound, &_newMessageSound);
+    if (!self) {
+        return self;
     }
 
+    NSURL *newMessageURL = [[NSBundle mainBundle] URLForResource:@"NewMessage" withExtension:@"aifc"];
+    AudioServicesCreateSystemSoundID((__bridge CFURLRef)newMessageURL, &_newMessageSound);
+
     return self;
 }
 

Signal/src/view controllers/MessagesViewController.m

@@ -1583,7 +1583,7 @@ typedef enum : NSUInteger {
     [self dismissViewControllerAnimated:YES
                              completion:^{
                                  DDLogVerbose(@"Sending attachment. Size in bytes: %lu, contentType: %@",
-                                              attachmentData.length,
+                                              (unsigned long)attachmentData.length,
                                               attachmentType);
 
                                [[TSMessagesManager sharedManager] sendAttachment:attachmentData

Signal/src/view controllers/SettingsTableViewCell.m

@@ -56,7 +56,7 @@
             break;
         default:
             DDLogWarn(@"Unknown Image Quality setting : %lu <%s>",
-                      [Environment.preferences imageUploadQuality],
+                      (unsigned long)[Environment.preferences imageUploadQuality],
                       __PRETTY_FUNCTION__);
             break;
     }