From 6bc145ce3a26bfc914cf7870e04f750168784110 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Jun 2018 14:43:04 -0400 Subject: [PATCH] Fix more build warnings. --- Signal.xcodeproj/project.pbxproj | 11 +++++++---- .../xcshareddata/xcschemes/Signal-Internal.xcscheme | 4 +--- .../xcshareddata/xcschemes/Signal.xcscheme | 2 +- .../xcschemes/SignalShareExtension.xcscheme | 4 +--- Signal/src/Jobs/MessageFetcherJob.swift | 2 +- Signal/src/ViewControllers/CallViewController.swift | 4 ++-- .../ConversationView/ConversationViewController.m | 2 +- Signal/src/network/PushManager.m | 6 ------ SignalServiceKit/src/Util/Cryptography.m | 4 ++-- SignalServiceKit/src/Util/OWSAnalytics.m | 6 +++--- SignalServiceKit/src/Util/OWSOperation.m | 2 +- 11 files changed, 20 insertions(+), 27 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 474ab1616..05e290b52 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -2567,7 +2567,7 @@ attributes = { LastSwiftUpdateCheck = 0920; LastTestingUpgradeCheck = 0600; - LastUpgradeCheck = 0910; + LastUpgradeCheck = 0940; ORGANIZATIONNAME = "Open Whisper Systems"; TargetAttributes = { 453518671FC635DD00210559 = { @@ -3486,6 +3486,7 @@ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -3871,7 +3872,7 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; @@ -3943,7 +3944,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; @@ -4022,7 +4023,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; @@ -4086,6 +4087,7 @@ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -4156,6 +4158,7 @@ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme index b492d0c84..3f70ff5eb 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme @@ -1,6 +1,6 @@ @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index d8504e849..fdde62597 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -1,6 +1,6 @@ @@ -61,7 +60,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "" selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Signal/src/Jobs/MessageFetcherJob.swift b/Signal/src/Jobs/MessageFetcherJob.swift index cea2f8573..9c4c88c63 100644 --- a/Signal/src/Jobs/MessageFetcherJob.swift +++ b/Signal/src/Jobs/MessageFetcherJob.swift @@ -26,7 +26,7 @@ public class MessageFetcherJob: NSObject { SwiftSingletons.register(self) } - public func run() -> Promise { + @discardableResult public func run() -> Promise { Logger.debug("\(self.logTag) in \(#function)") guard signalService.isCensorshipCircumventionActive else { diff --git a/Signal/src/ViewControllers/CallViewController.swift b/Signal/src/ViewControllers/CallViewController.swift index a6e171671..f49ae0167 100644 --- a/Signal/src/ViewControllers/CallViewController.swift +++ b/Signal/src/ViewControllers/CallViewController.swift @@ -616,12 +616,12 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, if formattedDate.hasPrefix("00:") { // Don't show the "hours" portion of the date format unless the // call duration is at least 1 hour. - formattedDate = formattedDate.substring(from: formattedDate.index(formattedDate.startIndex, offsetBy: 3)) + formattedDate = String(formattedDate[formattedDate.index(formattedDate.startIndex, offsetBy: 3)...]) } else { // If showing the "hours" portion of the date format, strip any leading // zeroes. if formattedDate.hasPrefix("0") { - formattedDate = formattedDate.substring(from: formattedDate.index(formattedDate.startIndex, offsetBy: 1)) + formattedDate = String(formattedDate[formattedDate.index(formattedDate.startIndex, offsetBy: 1)...]) } } return formattedDate diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 01c3c0f7b..e0f40e96e 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2880,7 +2880,7 @@ typedef enum : NSUInteger { - (void)resetFrame { // fixes bug on frame being off after this selection - CGRect frame = [UIScreen mainScreen].applicationFrame; + CGRect frame = [UIScreen mainScreen].bounds; self.view.frame = frame; } diff --git a/Signal/src/network/PushManager.m b/Signal/src/network/PushManager.m index 1b5101346..37859c532 100644 --- a/Signal/src/network/PushManager.m +++ b/Signal/src/network/PushManager.m @@ -112,19 +112,13 @@ NSString *const Signal_Message_MarkAsRead_Identifier = @"Signal_Message_MarkAsRe DDLogInfo(@"%@ received remote notification", self.logTag); [AppReadiness runNowOrWhenAppIsReady:^{ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-result" [self.messageFetcherJob run]; -#pragma GCC diagnostic pop }]; } - (void)applicationDidBecomeActive { [AppReadiness runNowOrWhenAppIsReady:^{ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-result" [self.messageFetcherJob run]; -#pragma GCC diagnostic pop }]; } diff --git a/SignalServiceKit/src/Util/Cryptography.m b/SignalServiceKit/src/Util/Cryptography.m index 272536cd4..a74ac4cff 100755 --- a/SignalServiceKit/src/Util/Cryptography.m +++ b/SignalServiceKit/src/Util/Cryptography.m @@ -377,9 +377,9 @@ const NSUInteger kAES256_KeyByteLength = 32; return [paddedPlainText copy]; } else { unsigned long paddingSize = paddedPlainText.length - unpaddedSize; - DDLogInfo(@"%@ decrypted padded attachment with unpaddedSize: %u, paddingSize: %lu", + DDLogInfo(@"%@ decrypted padded attachment with unpaddedSize: %lu, paddingSize: %lu", self.logTag, - unpaddedSize, + (unsigned long)unpaddedSize, paddingSize); return [paddedPlainText subdataWithRange:NSMakeRange(0, unpaddedSize)]; } diff --git a/SignalServiceKit/src/Util/OWSAnalytics.m b/SignalServiceKit/src/Util/OWSAnalytics.m index 59e62012e..191208f7a 100755 --- a/SignalServiceKit/src/Util/OWSAnalytics.m +++ b/SignalServiceKit/src/Util/OWSAnalytics.m @@ -267,9 +267,9 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity) dispatch_once(&onceToken, ^{ NSOperatingSystemVersion operatingSystemVersion = [[NSProcessInfo processInfo] operatingSystemVersion]; result = [NSString stringWithFormat:@"%zd.%zd.%zd", - operatingSystemVersion.majorVersion, - operatingSystemVersion.minorVersion, - operatingSystemVersion.patchVersion]; + (NSUInteger)operatingSystemVersion.majorVersion, + (NSUInteger)operatingSystemVersion.minorVersion, + (NSUInteger)operatingSystemVersion.patchVersion]; }); return result; } diff --git a/SignalServiceKit/src/Util/OWSOperation.m b/SignalServiceKit/src/Util/OWSOperation.m index a5d2bab33..59a005cbd 100644 --- a/SignalServiceKit/src/Util/OWSOperation.m +++ b/SignalServiceKit/src/Util/OWSOperation.m @@ -98,7 +98,7 @@ NSString *const OWSOperationKeyIsFinished = @"isFinished"; - (void)reportError:(NSError *)error { - DDLogDebug(@"%@ reportError: %@, fatal?: %d, retryable?: %d, remainingRetries: %d", + DDLogDebug(@"%@ reportError: %@, fatal?: %d, retryable?: %d, remainingRetries: %zd", self.logTag, error, error.isFatal,