From 5cf8cb092305ca355e1b46b9b848f1d60a1db250 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Jan 2021 10:39:09 -0300 Subject: [PATCH] Fix build warnings in the debugger. --- Signal/src/Signal-Bridging-Header.h | 6 ++---- .../ViewControllers/AppSettings/AboutTableViewController.h | 4 ++-- .../AppSettings/AdvancedSettingsTableViewController.h | 4 ++-- .../AppSettings/AppSettingsViewController.h | 4 ++-- .../ViewControllers/AppSettings/BlockListViewController.m | 6 +++--- .../AppSettings/DomainFrontingCountryViewController.m | 4 ++-- .../NotificationSettingsOptionsViewController.h | 4 ++-- .../AppSettings/NotificationSettingsViewController.h | 4 ++-- .../AppSettings/OWSSoundSettingsViewController.h | 4 ++-- .../AppSettings/PrivacySettingsTableViewController.h | 4 ++-- Signal/src/ViewControllers/DebugUI/DebugUIBackup.m | 4 ++-- Signal/src/ViewControllers/DebugUI/DebugUIContacts.m | 4 ++-- Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m | 4 ++-- Signal/src/ViewControllers/DebugUI/DebugUIMessages.m | 2 +- Signal/src/ViewControllers/DebugUI/DebugUIMisc.m | 2 +- Signal/src/ViewControllers/DebugUI/DebugUIPage.m | 4 ++-- Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m | 4 ++-- Signal/src/ViewControllers/DebugUI/DebugUISessionState.m | 4 ++-- Signal/src/ViewControllers/DebugUI/DebugUIStress.m | 4 ++-- Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m | 4 ++-- .../ViewControllers/DebugUI/DebugUITableViewController.h | 4 ++-- .../RecipientPicker/RecipientPickerViewController.m | 6 +++--- SignalMessaging/contacts/OWSSyncManager.h | 7 ++++--- SignalMessaging/utils/Dependencies+SignalMessaging.swift | 6 +----- 24 files changed, 49 insertions(+), 54 deletions(-) diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h index 90f066e6ee..42717a6ade 100644 --- 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 #import #import +#import #import #import +#import #import #import #import diff --git a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.h b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.h index ee8bbf74ce..e3b492f06c 100644 --- 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 @interface AboutTableViewController : OWSTableViewController diff --git a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.h b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.h index f52659d84c..7863ddda5e 100644 --- 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 @interface AdvancedSettingsTableViewController : OWSTableViewController diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.h b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.h index cfbb4e82d6..88a9115e24 100644 --- 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 NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m index fd571947ad..4a6014a364 100644 --- 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 #import #import +#import #import #import diff --git a/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m b/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m index 7306fa65d6..1e66c2fd88 100644 --- 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 #import #import diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.h b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.h index 450655b91d..0b9b0bc6e5 100644 --- 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 @interface NotificationSettingsOptionsViewController : OWSTableViewController diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.h b/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.h index 4ed3f2f816..b0547ab2c4 100644 --- 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 @interface NotificationSettingsViewController : OWSTableViewController diff --git a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.h b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.h index 3bf3f3e436..78b9ed001d 100644 --- 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 NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.h b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.h index fb04321864..3d0f456558 100644 --- 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 NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m b/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m index d381f6dd19..b5070e3854 100644 --- 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 #import #import +#import #ifdef DEBUG diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m index 0d6b7d4d03..f67b12b320 100644 --- 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 #import +#import #import #ifdef DEBUG diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m index 02fef0993b..5df6ef1a3a 100644 --- 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 +#import #import #ifdef DEBUG diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index 7fabf81994..0da5972ad7 100644 --- 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 #import #import #import +#import #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m index 70ea7da72d..0fcdf0ae16 100644 --- 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 #import #import #import +#import #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIPage.m b/Signal/src/ViewControllers/DebugUI/DebugUIPage.m index 205d474da4..742de4f40a 100644 --- 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 #ifdef DEBUG diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m b/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m index c4bb008c62..1ffa07e2e2 100644 --- 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 #import #import +#import #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m index bb21bb0e57..5a1eeac46e 100644 --- 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 #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m index ccf303605e..98f449e926 100644 --- 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 #import #import +#import #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m index 629d1101ff..c3df31219d 100644 --- 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 #import #import #import +#import #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.h b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.h index b122400011..3731dad732 100644 --- 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 #ifdef DEBUG diff --git a/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m b/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m index 5198bb19ef..2d64352edd 100644 --- 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 #import +#import #import +#import #import #import #import diff --git a/SignalMessaging/contacts/OWSSyncManager.h b/SignalMessaging/contacts/OWSSyncManager.h index 0d378e55cb..19bde1f875 100644 --- 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 - 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 + (SDSKeyValueStore *)keyValueStore; diff --git a/SignalMessaging/utils/Dependencies+SignalMessaging.swift b/SignalMessaging/utils/Dependencies+SignalMessaging.swift index 571a093589..dec7504b93 100644 --- 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 }