Merge branch 'charlesmchen/buildWarnings' into release/5.3.0

2021-01-20 09:48:41 -03:00 · 2021-01-20 09:48:41 -03:00 · ff3000ec02
commit ff3000ec02
parent 911702d62b 5cf8cb0923
24 changed files with 49 additions and 54 deletions
--- a/Signal/src/Signal-Bridging-Header.h
+++ b/Signal/src/Signal-Bridging-Header.h
@ -11,8 +11,6 @@
 #import "AppSettingsViewController.h"
 #import "AttachmentUploadView.h"
 #import "AvatarViewHelper.h"
-#import "ContactCellView.h"
-#import "ContactTableViewCell.h"
 #import "ConversationCollectionView.h"
 #import "ConversationInputToolbar.h"
 #import "ConversationListCell.h"
@ -27,8 +25,6 @@
 #import "FingerprintViewController.h"
 #import "MediaDetailViewController.h"
 #import "NotificationSettingsViewController.h"
-#import "OWSAnyTouchGestureRecognizer.h"
-#import "OWSAudioPlayer.h"
 #import "OWSBackup.h"
 #import "OWSBackupIO.h"
 #import "OWSBezierPathView.h"
@ -61,8 +57,10 @@
 #import <SignalCoreKit/OWSLogs.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/AttachmentSharing.h>
+#import <SignalMessaging/ContactCellView.h>
 #import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSAnyTouchGestureRecognizer.h>
 #import <SignalMessaging/OWSAudioPlayer.h>
 #import <SignalMessaging/OWSContactAvatarBuilder.h>
 #import <SignalMessaging/OWSContactsManager.h>
--- a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.h
+++ b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.h
@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

-#import "OWSTableViewController.h"
+#import <SignalMessaging/OWSTableViewController.h>

@interface AboutTableViewController : OWSTableViewController

--- a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.h
+++ b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.h
@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

-#import "OWSTableViewController.h"
+#import <SignalMessaging/OWSTableViewController.h>

@interface AdvancedSettingsTableViewController : OWSTableViewController

--- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.h
+++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.h
@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

-#import "OWSTableViewController.h"
+#import <SignalMessaging/OWSTableViewController.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m
@ -1,18 +1,18 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "BlockListViewController.h"
 #import "BlockListUIUtils.h"
-#import "ContactTableViewCell.h"
 #import "ContactsViewHelper.h"
-#import "OWSTableViewController.h"
 #import "PhoneNumber.h"
 #import "Signal-Swift.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
+#import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
 #import <SignalServiceKit/TSGroupThread.h>

--- a/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m
@ -1,12 +1,12 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DomainFrontingCountryViewController.h"
 #import "OWSCountryMetadata.h"
-#import "OWSTableViewController.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalMessaging/Theme.h>
 #import <SignalServiceKit/OWSSignalService.h>

--- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.h
+++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.h
@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

-#import "OWSTableViewController.h"
+#import <SignalMessaging/OWSTableViewController.h>

@interface NotificationSettingsOptionsViewController : OWSTableViewController

--- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.h
+++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.h
@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

-#import "OWSTableViewController.h"
+#import <SignalMessaging/OWSTableViewController.h>

@interface NotificationSettingsViewController : OWSTableViewController

--- a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.h
+++ b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.h
@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

-#import "OWSTableViewController.h"
+#import <SignalMessaging/OWSTableViewController.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.h
+++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.h
@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

-#import "OWSTableViewController.h"
+#import <SignalMessaging/OWSTableViewController.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m
@ -1,14 +1,14 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DebugUIBackup.h"
 #import "OWSBackup.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import <CloudKit/CloudKit.h>
 #import <PromiseKit/AnyPromise.h>
 #import <SignalCoreKit/Randomness.h>
+#import <SignalMessaging/OWSTableViewController.h>

 #ifdef DEBUG

--- a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
@ -1,14 +1,14 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DebugUIContacts.h"
 #import "DebugContactsUtils.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import <Contacts/Contacts.h>
 #import <SignalCoreKit/Randomness.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>

 #ifdef DEBUG
--- a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
@ -1,12 +1,12 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DebugUIDiskUsage.h"
 #import "OWSOrphanDataCleaner.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalServiceKit/TSInteraction.h>

 #ifdef DEBUG
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@ -7,12 +7,12 @@
 #import "DebugUIContacts.h"
 #import "DebugUIMessagesAction.h"
 #import "DebugUIMessagesAssetLoader.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import <MobileCoreServices/UTCoreTypes.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/OWSBatchMessageProcessor.h>
 #import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
@ -6,13 +6,13 @@
 #import "DebugUIMessagesAssetLoader.h"
 #import "OWSBackup.h"
 #import "OWSCountryMetadata.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import "ThreadUtil.h"
 #import <AxolotlKit/PreKeyBundle.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/AttachmentSharing.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
--- a/Signal/src/ViewControllers/DebugUI/DebugUIPage.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIPage.m
@ -1,9 +1,9 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DebugUIPage.h"
-#import "OWSTableViewController.h"
+#import <SignalMessaging/OWSTableViewController.h>

 #ifdef DEBUG

--- a/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m
@ -1,15 +1,15 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DebugUIScreenshots.h"
 #import "DebugContactsUtils.h"
 #import "DebugUIContacts.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/OWSBatchMessageProcessor.h>
 #import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
--- a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
@ -1,10 +1,10 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DebugUISessionState.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/SSKSessionStore.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
--- a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
@ -1,10 +1,9 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DebugUIStress.h"
 #import "MessageSender.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import "ThreadUtil.h"
@ -12,6 +11,7 @@
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
--- a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
@ -1,16 +1,16 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DebugUISyncMessages.h"
 #import "DebugUIContacts.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import "ThreadUtil.h"
 #import <AxolotlKit/PreKeyBundle.h>
 #import <PromiseKit/AnyPromise.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalServiceKit/OWSBatchMessageProcessor.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
--- a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.h
@ -1,9 +1,9 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "DebugUIPage.h"
-#import "OWSTableViewController.h"
+#import <SignalMessaging/OWSTableViewController.h>

 #ifdef DEBUG

--- a/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m
+++ b/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m
@ -1,17 +1,17 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

 #import "RecipientPickerViewController.h"
-#import "ContactTableViewCell.h"
 #import "ContactsViewHelper.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import "UIView+OWS.h"
 #import <MessageUI/MessageUI.h>
 #import <PromiseKit/AnyPromise.h>
+#import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/AppVersion.h>
 #import <SignalServiceKit/PhoneNumberUtil.h>
--- a/SignalMessaging/contacts/OWSSyncManager.h
+++ b/SignalMessaging/contacts/OWSSyncManager.h
@ -1,9 +1,7 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //

-#import <SignalServiceKit/SignalServiceKit-Swift.h>
-
 NS_ASSUME_NONNULL_BEGIN

 extern NSString *const OWSSyncManagerConfigurationSyncDidCompleteNotification;
@ -16,6 +14,9 @@ extern NSString *const OWSSyncManagerKeysSyncDidCompleteNotification;
@class OWSProfileManager;
@class SDSKeyValueStore;

+@protocol SyncManagerProtocol;
+@protocol SyncManagerProtocolObjc;
+
@interface OWSSyncManager : NSObject <SyncManagerProtocolObjc>

 + (SDSKeyValueStore *)keyValueStore;
--- a/SignalMessaging/utils/Dependencies+SignalMessaging.swift
+++ b/SignalMessaging/utils/Dependencies+SignalMessaging.swift
@ -8,8 +8,6 @@ import Foundation
@objc
 public extension UIResponder {

-    // MARK: - Dependencies
-
    var audioSession: OWSAudioSession {
        Environment.shared.audioSession
    }
@ -263,12 +261,10 @@ public extension UIResponder {
    }
 }

-// MARK: -
+// MARK: - Swift-only Dependencies

 public extension UIResponder {

-    // MARK: - Dependencies
-
    var groupsV2: GroupsV2Swift {
        SSKEnvironment.shared.groupsV2 as! GroupsV2Swift
    }