From d24d54d4f28740e3073ed162def0fef90b5ed2a9 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 8 Jul 2016 16:39:28 -0700 Subject: [PATCH] small IOS9 Fixes (#1253) * Fix compiler warnings by explicitly casting to int. * Show a better permissions message when viewing attachments. * Fix comment. // FREEBIE --- Libraries/FLAnimatedImage/FLAnimatedImage.m | 4 ++-- Signal/Signal-Info.plist | 2 +- Signal/src/audio/AppAudioManager.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Libraries/FLAnimatedImage/FLAnimatedImage.m b/Libraries/FLAnimatedImage/FLAnimatedImage.m index 47c10ec9e..cceb75e31 100755 --- a/Libraries/FLAnimatedImage/FLAnimatedImage.m +++ b/Libraries/FLAnimatedImage/FLAnimatedImage.m @@ -649,8 +649,8 @@ static NSHashTable *allAnimatedImagesWeak; // "In iOS 4.0 and later, and OS X v10.6 and later, you can pass NULL if you want Quartz to allocate memory for the bitmap." (source: docs) void *data = NULL; - size_t width = imageToPredraw.size.width; - size_t height = imageToPredraw.size.height; + size_t width = (size_t)imageToPredraw.size.width; + size_t height = (size_t)imageToPredraw.size.height; size_t bitsPerComponent = CHAR_BIT; size_t bitsPerPixel = (bitsPerComponent * numberOfComponents); diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 0c39d68d7..b157387f4 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -74,7 +74,7 @@ NSMicrophoneUsageDescription Signal needs access to your microphone to make and receive phone calls. NSAppleMusicUsageDescription - Signal will let you choose which media from your library to send. + Signal needs to use Apple Music to play media attachments. NSPhotoLibraryUsageDescription Signal will let you choose which photos from your library to send. UIApplicationShortcutItems diff --git a/Signal/src/audio/AppAudioManager.h b/Signal/src/audio/AppAudioManager.h index de53a778a..035f6dee1 100644 --- a/Signal/src/audio/AppAudioManager.h +++ b/Signal/src/audio/AppAudioManager.h @@ -8,10 +8,10 @@ /** * The AppAudioManager is a Singleton object used to control audio settings / updates * for the entire application. This includes playing sounds appropriately, Initializing - * Audio Settings, and interfacing with the OS. The Call Audio Pipeline it self is delegated + * Audio Settings, and interfacing with the OS. The Call Audio Pipeline itself is delegated * to the RemoteIOAudio Class. * - * The Audio Profile determines which preset of logic to use for playing sounds, Such as + * The AudioProfile determines which preset of logic to use for playing sounds, Such as * which speaker to use or if all sounds should be muted. **/