diff --git a/Signal/src/Models/OWSErrorMessage.m b/Signal/src/Models/OWSErrorMessage.m index 522c0adfe..6c4095131 100644 --- a/Signal/src/Models/OWSErrorMessage.m +++ b/Signal/src/Models/OWSErrorMessage.m @@ -64,7 +64,7 @@ self.senderId, self.senderDisplayName, self.date, - self.errorMessageType]; + (long)self.errorMessageType]; } - (TSMessageAdapterType)messageType diff --git a/Signal/src/Models/OWSInfoMessage.m b/Signal/src/Models/OWSInfoMessage.m index bc6319b08..de34ab554 100644 --- a/Signal/src/Models/OWSInfoMessage.m +++ b/Signal/src/Models/OWSInfoMessage.m @@ -49,7 +49,7 @@ self.senderId, self.senderDisplayName, self.date, - self.infoMessageType]; + (long)self.infoMessageType]; } @end diff --git a/Signal/src/environment/NotificationsManager.m b/Signal/src/environment/NotificationsManager.m index 294b94048..5b7091d42 100644 --- a/Signal/src/environment/NotificationsManager.m +++ b/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; } diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m index bbb2b8c04..d1d4433f4 100644 --- a/Signal/src/view controllers/MessagesViewController.m +++ b/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 diff --git a/Signal/src/view controllers/SettingsTableViewCell.m b/Signal/src/view controllers/SettingsTableViewCell.m index 33cddb221..3e090915c 100644 --- a/Signal/src/view controllers/SettingsTableViewCell.m +++ b/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; }