From 74bbe067d88d6ad3eb7817a3e5a9ab273e0acca9 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Fri, 5 Jun 2020 10:38:44 +1000 Subject: [PATCH] Update Pods --- .../NotificationServiceExtension.swift | 2 +- .../NotificationServiceExtensionContext.swift | 2 +- Podfile | 2 +- Podfile.lock | 232 ++++++++---------- Signal.xcodeproj/project.pbxproj | 50 ++-- Signal/Signal-Prefix.pch | 14 +- Signal/src/AppDelegate.m | 40 +-- Signal/src/Jobs/MessageFetcherJob.swift | 2 +- Signal/src/Jobs/OWSSessionResetJobRecord.h | 2 +- Signal/src/Jobs/OWSSessionResetJobRecord.m | 2 +- Signal/src/Jobs/SessionResetJob.swift | 2 +- Signal/src/Jobs/SyncPushTokensJob.swift | 2 +- Signal/src/Models/AccountManager.swift | 2 +- .../Models/CompareSafetyNumbersActivity.swift | 2 +- .../Models/OWSDeviceProvisioningURLParser.m | 4 +- Signal/src/Models/PhoneNumberValidator.swift | 2 +- Signal/src/Signal-Bridging-Header.h | 120 ++++----- .../AppSettings/AboutTableViewController.m | 4 +- .../AddToBlockListViewController.m | 2 +- .../AdvancedSettingsTableViewController.m | 2 +- .../AppSettings/AppSettingsViewController.m | 4 +- .../AppSettings/BlockListViewController.m | 4 +- .../DomainFrontingCountryViewController.m | 2 +- .../OWSBackupSettingsViewController.m | 2 +- .../AppSettings/OWSLinkDeviceViewController.m | 12 +- .../OWSLinkedDevicesTableViewController.m | 10 +- .../PrivacySettingsTableViewController.m | 8 +- Signal/src/ViewControllers/AvatarViewHelper.m | 8 +- .../Call/CallViewController.swift | 2 +- .../ContactShareViewHelper.swift | 2 +- .../ContactViewController.swift | 2 +- .../src/ViewControllers/ContactsPicker.swift | 2 +- .../Cells/AttachmentUploadView.m | 6 +- .../Cells/OWSAudioMessageView.m | 2 +- .../Cells/OWSContactShareButtonsView.m | 2 +- .../Cells/OWSContactShareView.m | 2 +- .../Cells/OWSGenericAttachmentView.m | 6 +- .../ConversationView/Cells/OWSMessageCell.m | 2 +- .../Cells/OWSMessageTimerView.m | 4 +- .../Cells/OWSQuotedMessageView.m | 6 +- .../Cells/OWSSystemMessageCell.m | 8 +- .../ConversationInputTextView.m | 2 +- .../ConversationInputToolbar.m | 4 +- .../ConversationViewController.m | 54 ++-- .../ConversationView/ConversationViewItem.m | 12 +- .../ConversationView/ConversationViewModel.m | 20 +- .../DebugUI/DebugContactsUtils.m | 2 +- .../ViewControllers/DebugUI/DebugUIBackup.m | 2 +- .../DebugUI/DebugUICalling.swift | 2 +- .../ViewControllers/DebugUI/DebugUIContacts.m | 2 +- .../DebugUI/DebugUIDiskUsage.m | 8 +- .../ViewControllers/DebugUI/DebugUIMessages.m | 28 +-- .../DebugUI/DebugUIMessagesAction.m | 2 +- .../DebugUI/DebugUIMessagesAssetLoader.m | 10 +- .../src/ViewControllers/DebugUI/DebugUIMisc.m | 18 +- .../DebugUI/DebugUINotifications.swift | 2 +- .../DebugUI/DebugUIProfile.swift | 2 +- .../DebugUI/DebugUISessionState.m | 6 +- .../ViewControllers/DebugUI/DebugUIStress.m | 18 +- .../DebugUI/DebugUISyncMessages.m | 36 +-- .../DebugUI/DebugUITableViewController.m | 4 +- .../GifPicker/GifPickerCell.swift | 2 +- .../GifPicker/GifPickerViewController.swift | 2 +- .../ViewControllers/HomeView/HomeViewCell.m | 8 +- .../HomeView/HomeViewController.m | 14 +- Signal/src/ViewControllers/InviteFlow.swift | 2 +- .../LongTextViewController.swift | 2 +- .../MediaDetailViewController.m | 2 +- .../MessageDetailViewController.swift | 2 +- .../NewContactThreadViewController.m | 10 +- .../ViewControllers/NewGroupViewController.m | 16 +- .../OWS2FASettingsViewController.m | 4 +- .../ViewControllers/ProfileViewController.m | 6 +- .../SafetyNumberConfirmationAlert.swift | 2 +- .../SignalsNavigationController.m | 6 +- .../ThreadSettings/AddToGroupViewController.m | 2 +- .../FingerprintViewController.m | 16 +- .../FingerprintViewScanController.m | 8 +- .../OWSConversationSettingsViewController.m | 18 +- .../ShowGroupMembersViewController.m | 8 +- .../UpdateGroupViewController.m | 14 +- .../Utils/MessageRecipientStatusUtils.swift | 2 +- Signal/src/call/CallAudioService.swift | 2 +- Signal/src/call/CallService.swift | 2 +- Signal/src/call/NonCallKitCallUIAdaptee.swift | 2 +- Signal/src/call/OutboundCallInitiator.swift | 2 +- Signal/src/call/PeerConnectionClient.swift | 2 +- Signal/src/call/SignalCall.swift | 2 +- .../call/Speakerbox/CallKitCallManager.swift | 2 +- .../Speakerbox/CallKitCallUIAdaptee.swift | 2 +- .../call/UserInterface/CallUIAdapter.swift | 2 +- .../src/call/WebRTCCallMessageHandler.swift | 2 +- Signal/src/environment/AppEnvironment.swift | 2 +- .../ExperienceUpgrade.swift | 2 +- .../ExperienceUpgradeFinder.swift | 2 +- .../environment/PushRegistrationManager.swift | 2 +- Signal/src/environment/SignalApp.m | 8 +- Signal/src/network/GiphyDownloader.swift | 2 +- Signal/src/util/Backup/OWSBackup.m | 6 +- Signal/src/util/Backup/OWSBackupAPI.swift | 2 +- Signal/src/util/Backup/OWSBackupExportJob.m | 20 +- Signal/src/util/Backup/OWSBackupIO.m | 4 +- Signal/src/util/Backup/OWSBackupImportJob.m | 12 +- Signal/src/util/Backup/OWSBackupJob.h | 2 +- Signal/src/util/Backup/OWSBackupJob.m | 2 +- .../util/Backup/OWSBackupLazyRestore.swift | 2 +- Signal/src/util/DateUtil.m | 4 +- Signal/src/util/MainAppContext.h | 2 +- Signal/src/util/MainAppContext.m | 4 +- Signal/src/util/OWSAnalytics.swift | 2 +- Signal/src/util/OWSOrphanDataCleaner.m | 24 +- Signal/src/util/Pastelog.m | 12 +- Signal/src/util/RegistrationUtils.m | 2 +- .../src/util/UIViewController+Permissions.m | 2 +- Signal/src/views/AudioProgressView.swift | 2 +- Signal/src/views/ContactCell.swift | 2 +- Signal/src/views/GroupTableViewCell.swift | 2 +- Signal/src/views/OWSDeviceTableViewCell.h | 2 +- Signal/src/views/OWSProgressView.m | 2 +- Signal/src/views/RemoteVideoView.m | 2 +- Signal/test/Models/MantlePerfTest.swift | 2 +- .../OWSDeviceProvisioningURLParserTest.m | 2 +- .../test/SSKTests/SSKProtoEnvelopeTest.swift | 2 +- Signal/test/SignalBaseTest.h | 2 +- Signal/test/SignalBaseTest.m | 4 +- .../ConversationViewItemTest.m | 10 +- Signal/test/util/CDSSigningCertificateTest.m | 4 +- Signal/test/util/OWSDatabaseConverterTest.m | 10 +- Signal/test/util/OWSOrphanDataCleanerTest.m | 10 +- Signal/test/util/ProtoParsingTest.m | 14 +- Signal/test/util/UtilTest.m | 6 +- ...K001UpdateFriendRequestStatusStorage.swift | 2 +- .../Models/OWSContactOffersInteraction.h | 2 +- .../Models/TSUnreadIndicatorInteraction.h | 2 +- SignalMessaging/SignalMessaging-Prefix.pch | 8 +- SignalMessaging/SignalMessaging.h | 2 +- .../ContactShareApprovalViewController.swift | 2 +- .../CountryCodeViewController.m | 2 +- .../EditContactShareNameViewController.swift | 2 +- .../ViewControllers/MediaMessageView.swift | 2 +- ...ModalActivityIndicatorViewController.swift | 2 +- .../NewNonContactConversationViewController.m | 2 +- .../SelectRecipientViewController.m | 10 +- .../SelectThreadViewController.m | 12 +- .../SharingThreadPickerViewController.m | 8 +- .../ViewControllers/ViewControllerUtils.m | 4 +- .../ViewModels/OWSQuotedReplyModel.h | 2 +- .../ViewModels/OWSQuotedReplyModel.m | 20 +- SignalMessaging/Views/ContactCellView.m | 10 +- SignalMessaging/Views/ContactTableViewCell.m | 2 +- SignalMessaging/Views/ContactsViewHelper.m | 14 +- SignalMessaging/Views/OWSFlatButton.swift | 2 +- SignalMessaging/Views/ThreadViewHelper.m | 8 +- .../appearance/OWSConversationColor.h | 2 +- .../appearance/OWSConversationColor.m | 2 +- SignalMessaging/appearance/Theme.m | 6 +- .../attachments/AttachmentSharing.m | 6 +- .../attachments/SignalAttachment.swift | 2 +- .../categories/NSAttributedString+OWS.m | 2 +- SignalMessaging/categories/UIColor+OWS.m | 2 +- SignalMessaging/categories/UIFont+OWS.m | 2 +- SignalMessaging/categories/UIView+OWS.h | 2 +- SignalMessaging/categories/UIView+OWS.m | 4 +- .../categories/UIViewController+OWS.m | 4 +- SignalMessaging/contacts/OWSContactsManager.h | 4 +- SignalMessaging/contacts/OWSContactsManager.m | 18 +- SignalMessaging/contacts/OWSSyncManager.h | 2 +- SignalMessaging/contacts/OWSSyncManager.m | 32 +-- .../contacts/SystemContactsFetcher.swift | 2 +- SignalMessaging/environment/AppSetup.m | 36 +-- SignalMessaging/environment/Environment.h | 2 +- SignalMessaging/environment/Environment.m | 4 +- .../environment/NoopCallMessageHandler.swift | 2 +- SignalMessaging/environment/OWSSounds.m | 8 +- .../environment/SignalKeyingStorage.m | 6 +- .../environment/VersionMigrations.m | 18 +- .../migrations/OWS103EnableVideoCalling.m | 8 +- .../OWS104CreateRecipientIdentities.m | 4 +- .../migrations/OWS105AttachmentFilePaths.m | 2 +- .../OWS106EnsureProfileComplete.swift | 2 +- .../migrations/OWS109OutgoingMessageState.m | 4 +- .../OWS111UDAttributesMigration.swift | 2 +- .../OWS112TypingIndicatorsMigration.swift | 2 +- .../OWS113MultiAttachmentMediaMessages.swift | 2 +- .../OWS114RemoveDynamicInteractions.swift | 2 +- .../migrations/OWSDatabaseMigration.h | 2 +- .../migrations/OWSDatabaseMigration.m | 4 +- .../migrations/OWSDatabaseMigrationRunner.m | 2 +- SignalMessaging/profiles/OWSProfileManager.h | 2 +- SignalMessaging/profiles/OWSProfileManager.m | 48 ++-- SignalMessaging/profiles/OWSUserProfile.h | 2 +- SignalMessaging/profiles/OWSUserProfile.m | 20 +- .../profiles/ProfileFetcherJob.swift | 4 +- SignalMessaging/utils/BlockListUIUtils.m | 10 +- SignalMessaging/utils/DebugLogger.m | 6 +- .../utils/DeviceSleepManager.swift | 2 +- SignalMessaging/utils/FullTextSearcher.swift | 2 +- SignalMessaging/utils/OWSAudioPlayer.m | 2 +- .../utils/OWSContactAvatarBuilder.h | 2 +- .../utils/OWSContactAvatarBuilder.m | 2 +- SignalMessaging/utils/OWSGroupAvatarBuilder.m | 4 +- SignalMessaging/utils/OWSPreferences.m | 16 +- SignalMessaging/utils/ThreadUtil.m | 32 +-- SignalMessaging/utils/UIUtil.h | 4 +- SignalMessaging/utils/UIUtil.m | 2 +- .../src/Account/TSAccountManager.m | 6 +- .../src/Account/TSPreKeyManager.m | 4 +- .../src/Contacts/CDSSigningCertificate.m | 4 +- SignalServiceKit/src/Contacts/Contact.m | 4 +- .../src/Contacts/ContactDiscoveryService.m | 10 +- .../src/Contacts/ContactsUpdater.m | 6 +- .../OWSDisappearingMessagesConfiguration.m | 2 +- .../src/Contacts/SignalRecipient.m | 2 +- SignalServiceKit/src/Contacts/TSThread.m | 6 +- .../src/Contacts/Threads/TSContactThread.m | 4 +- .../src/Contacts/Threads/TSGroupThread.m | 6 +- .../Devices/OWSBlockedPhoneNumbersMessage.m | 2 +- .../src/Devices/OWSChunkedOutputStream.m | 2 +- .../src/Devices/OWSContactsOutputStream.m | 6 +- SignalServiceKit/src/Devices/OWSDevice.m | 6 +- .../src/Devices/OWSGroupsOutputStream.m | 2 +- .../src/Devices/OWSProvisioningCipher.m | 6 +- .../src/Devices/OWSProvisioningMessage.m | 8 +- .../OWSReadReceiptsForLinkedDevicesMessage.m | 2 +- .../src/Devices/OWSReceiptsForSenderMessage.m | 4 +- .../src/Devices/OWSRecordTranscriptJob.m | 2 +- .../Devices/OWSVerificationStateSyncMessage.m | 4 +- .../src/Loki/API/LokiDotNetAPI.swift | 2 +- .../src/Loki/API/LokiFileServerProxy.swift | 2 +- .../Loki/Database/OWSPrimaryStorage+Loki.h | 8 +- .../Loki/Database/OWSPrimaryStorage+Loki.m | 4 +- .../Closed Groups/LKSessionRequestMessage.m | 4 +- .../Friend Requests/LKFriendRequestMessage.m | 2 +- .../src/Loki/Protocol/Meta/LKAddressMessage.m | 2 +- .../Loki/Protocol/Meta/LKEphemeralMessage.m | 4 +- .../Multi Device/DeviceLinkingSession.swift | 2 +- .../Multi Device/LKDeviceLinkMessage.m | 6 +- .../Multi Device/LKUnlinkDeviceMessage.m | 4 +- .../LKSessionRestoreMessage.m | 4 +- .../LokiSessionResetImplementation.swift | 2 +- .../Sync Messages/LKSyncOpenGroupsMessage.m | 2 +- .../Attachments/OWSAttachmentDownloads.m | 4 +- .../src/Messages/Attachments/TSAttachment.m | 2 +- .../Attachments/TSAttachmentPointer.m | 4 +- .../Messages/Attachments/TSAttachmentStream.m | 4 +- .../OWSIncomingSentMessageTranscript.m | 2 +- .../OWSOutgoingSentMessageTranscript.m | 2 +- .../DeviceSyncing/OWSOutgoingSyncMessage.m | 6 +- .../OWSSyncConfigurationMessage.m | 2 +- .../DeviceSyncing/OWSSyncContactsMessage.m | 4 +- .../DeviceSyncing/OWSSyncGroupsMessage.m | 4 +- .../OWSSyncGroupsRequestMessage.m | 4 +- .../src/Messages/Interactions/OWSContact.h | 2 +- .../src/Messages/Interactions/OWSContact.m | 2 +- ...DisappearingMessagesConfigurationMessage.m | 4 +- .../Interactions/OWSDynamicOutgoingMessage.m | 4 +- .../Interactions/OWSEndSessionMessage.m | 2 +- .../Messages/Interactions/TSErrorMessage.m | 4 +- .../Messages/Interactions/TSIncomingMessage.m | 2 +- .../src/Messages/Interactions/TSInfoMessage.m | 2 +- .../src/Messages/Interactions/TSInteraction.m | 4 +- .../src/Messages/Interactions/TSMessage.m | 4 +- .../Messages/Interactions/TSOutgoingMessage.m | 4 +- .../Messages/Interactions/TSQuotedMessage.h | 2 +- .../Messages/Interactions/TSQuotedMessage.m | 2 +- ...SInvalidIdentityKeyReceivingErrorMessage.m | 6 +- .../TSInvalidIdentityKeySendingErrorMessage.m | 2 +- .../src/Messages/OWSBatchMessageProcessor.m | 4 +- .../Messages/OWSDisappearingMessagesFinder.m | 2 +- .../src/Messages/OWSDisappearingMessagesJob.m | 2 +- .../src/Messages/OWSIdentityManager.h | 2 +- .../src/Messages/OWSIdentityManager.m | 8 +- .../src/Messages/OWSIncompleteCallsJob.m | 2 +- .../src/Messages/OWSMessageDecrypter.m | 16 +- .../src/Messages/OWSMessageHandler.m | 2 +- .../src/Messages/OWSMessageManager.m | 12 +- .../src/Messages/OWSMessageReceiver.m | 8 +- .../src/Messages/OWSMessageSend.swift | 2 +- .../src/Messages/OWSMessageSender.m | 24 +- .../src/Messages/OWSMessageServiceParams.m | 2 +- .../src/Messages/OWSOutgoingCallMessage.m | 4 +- .../src/Messages/OWSOutgoingNullMessage.m | 6 +- .../src/Messages/OWSOutgoingReceiptManager.m | 2 +- .../src/Messages/OWSProfileKeyMessage.m | 2 +- .../src/Messages/OWSReadReceiptManager.m | 6 +- .../src/Messages/PreKeyBundle+jsonDict.h | 2 +- .../src/Messages/PreKeyBundle+jsonDict.m | 2 +- SignalServiceKit/src/Messages/TSGroupModel.m | 2 +- .../src/Messages/UD/OWSRequestMaker.swift | 2 +- .../src/Messages/UD/OWSUDManager.swift | 4 +- .../src/Network/API/OWSRequestBuilder.m | 2 +- .../src/Network/API/OWSUploadOperation.m | 4 +- .../Network/API/Requests/OWSRequestFactory.m | 14 +- .../src/Network/API/Requests/TSRequest.m | 4 +- .../src/Network/API/TSNetworkManager.m | 4 +- .../src/Network/ContentProxy.swift | 2 +- .../src/Network/SignalServiceClient.swift | 2 +- .../src/Network/WebSockets/OWSWebSocket.m | 6 +- SignalServiceKit/src/Protocols/ProtoUtils.m | 4 +- .../src/Security/OWSFingerprint.m | 6 +- .../src/Security/OWSFingerprintBuilder.m | 2 +- .../src/Security/OWSRecipientIdentity.m | 4 +- SignalServiceKit/src/SignalServiceKit.h | 18 +- .../OWSPrimaryStorage+PreKeyStore.h | 2 +- .../OWSPrimaryStorage+PreKeyStore.m | 6 +- .../OWSPrimaryStorage+SessionStore.h | 2 +- .../OWSPrimaryStorage+SessionStore.m | 2 +- .../OWSPrimaryStorage+SignedPreKeyStore.h | 2 +- .../OWSPrimaryStorage+SignedPreKeyStore.m | 6 +- .../src/Storage/OWSPrimaryStorage.m | 2 +- SignalServiceKit/src/Storage/OWSStorage.m | 6 +- SignalServiceKit/src/Storage/SSKJobRecord.m | 2 +- .../src/Storage/YapDatabaseConnection+OWS.m | 8 +- .../src/Storage/YapDatabaseTransaction+OWS.m | 8 +- SignalServiceKit/src/TSPrefix.h | 4 +- .../src/TestUtils/MockSSKEnvironment.m | 2 +- .../src/TestUtils/OWSFakeMessageSender.m | 2 +- .../src/TestUtils/OWSFakeProfileManager.m | 4 +- .../src/TestUtils/TestAppContext.m | 4 +- SignalServiceKit/src/Util/AppReadiness.m | 2 +- SignalServiceKit/src/Util/AppVersion.m | 2 +- SignalServiceKit/src/Util/DataSource.m | 6 +- SignalServiceKit/src/Util/DeviceNames.swift | 4 +- SignalServiceKit/src/Util/NSData+Image.m | 2 +- SignalServiceKit/src/Util/NSString+SSK.h | 2 +- SignalServiceKit/src/Util/OWS2FAManager.m | 2 +- SignalServiceKit/src/Util/OWSAnalytics.m | 2 +- SignalServiceKit/src/Util/OWSBackgroundTask.m | 2 +- SignalServiceKit/src/Util/OWSFileSystem.m | 2 +- SignalServiceKit/src/Util/SSKAsserts.h | 4 +- .../tests/Account/SignedPreKeyDeletionTests.m | 2 +- .../tests/Contacts/SignalRecipientTest.m | 2 +- .../tests/Contacts/TSThreadTest.m | 2 +- .../tests/Devices/OWSProvisioningCipherTest.m | 6 +- .../Messages/Interactions/TSMessageTest.m | 2 +- .../OWSDisappearingMessageFinderTest.m | 4 +- .../Messages/OWSDisappearingMessagesJobTest.m | 2 +- .../tests/Messages/OWSLinkPreviewTest.swift | 2 +- .../tests/Messages/OWSMessageManagerTest.m | 4 +- .../tests/Messages/OWSMessageSenderTest.m | 6 +- .../tests/Messages/OWSUDManagerTest.swift | 6 +- .../Network/MessageSendJobQueueTest.swift | 2 +- .../Network/MessageSenderJobRecordTest.swift | 2 +- SignalServiceKit/tests/SSKBaseTestObjC.h | 2 +- SignalServiceKit/tests/SSKBaseTestSwift.swift | 2 +- .../tests/Security/OWSFingerprintTest.m | 2 +- .../Storage/TSStorageIdentityKeyStoreTests.m | 4 +- .../tests/Util/DeviceNamesTest.swift | 4 +- .../tests/Util/JobQueueTest.swift | 2 +- .../tests/Util/TSMessageStorageTests.m | 2 +- .../SAEScreenLockViewController.m | 2 +- .../ShareViewController.swift | 2 +- .../SignalShareExtension-Bridging-Header.h | 18 +- .../SignalShareExtension-Prefix.pch | 6 +- .../utils/ShareAppExtensionContext.h | 2 +- .../utils/ShareAppExtensionContext.m | 6 +- 356 files changed, 1128 insertions(+), 1148 deletions(-) diff --git a/LokiPushNotificationService/NotificationServiceExtension.swift b/LokiPushNotificationService/NotificationServiceExtension.swift index 2cbf3761b..1e7f4e07e 100644 --- a/LokiPushNotificationService/NotificationServiceExtension.swift +++ b/LokiPushNotificationService/NotificationServiceExtension.swift @@ -1,5 +1,5 @@ import UserNotifications -import SignalServiceKit +import SessionServiceKit import SignalMessaging final class NotificationServiceExtension : UNNotificationServiceExtension { diff --git a/LokiPushNotificationService/NotificationServiceExtensionContext.swift b/LokiPushNotificationService/NotificationServiceExtensionContext.swift index 0b5475c2f..71dfb8279 100644 --- a/LokiPushNotificationService/NotificationServiceExtensionContext.swift +++ b/LokiPushNotificationService/NotificationServiceExtensionContext.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging final class NotificationServiceExtensionContext : NSObject, AppContext { diff --git a/Podfile b/Podfile index 318c52876..87e0377c9 100644 --- a/Podfile +++ b/Podfile @@ -19,7 +19,7 @@ def shared_pods pod 'SessionHKDFKit', git: 'https://github.com/nielsandriesse/session-ios-hkdf-kit.git', testspecs: ["Tests"] # Fork of HKDFKit # pod 'HKDFKit', path: '../HKDFKit', testspecs: ["Tests"] - pod 'SessionCurve25519Kit', git: 'https://github.com/loki-project/session-ios-curve25519-kit', testspecs: ["Tests"] # Fork of Curve25519Kit + pod 'SessionCurve25519Kit', git: 'https://github.com/loki-project/session-ios-curve-25519-kit', testspecs: ["Tests"] # Fork of Curve25519Kit # pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"] pod 'SessionMetadataKit', git: 'https://github.com/loki-project/session-ios-metadata-kit', testspecs: ["Tests"] # Fork of SignalMetadataKit diff --git a/Podfile.lock b/Podfile.lock index a640bd31f..2d5f9c499 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,49 +14,16 @@ PODS: - AFNetworking/Serialization (3.2.1) - AFNetworking/UIKit (3.2.1): - AFNetworking/NSURLSession - - AxolotlKit (0.9.0): - - CocoaLumberjack - - Curve25519Kit (~> 2.1.0) - - HKDFKit (~> 0.0.3) - - SignalCoreKit - - SwiftProtobuf - - AxolotlKit/Tests (0.9.0): - - CocoaLumberjack - - Curve25519Kit (~> 2.1.0) - - HKDFKit (~> 0.0.3) - - SignalCoreKit - - SwiftProtobuf - - CocoaLumberjack (3.5.3): - - CocoaLumberjack/Core (= 3.5.3) - - CocoaLumberjack/Core (3.5.3) - - Crashlytics (3.13.1): - - Fabric (~> 1.10.1) + - CocoaLumberjack (3.6.1): + - CocoaLumberjack/Core (= 3.6.1) + - CocoaLumberjack/Core (3.6.1) - CryptoSwift (1.0.0) - - Curve25519Kit (2.1.0): - - CocoaLumberjack - - SignalCoreKit - - Curve25519Kit/Tests (2.1.0): - - CocoaLumberjack - - SignalCoreKit - - Fabric (1.10.1) - FeedKit (8.1.1) - - FirebaseCore (6.0.2): - - GoogleUtilities/Environment (~> 6.0) - - GoogleUtilities/Logger (~> 6.0) - GCDWebServer (3.5.2): - GCDWebServer/Core (= 3.5.2) - GCDWebServer/Core (3.5.2) - - GoogleUtilities/Environment (6.2.0) - - GoogleUtilities/Logger (6.2.0): - - GoogleUtilities/Environment - GRKOpenSSLFramework (1.0.2.12) - - HKDFKit (0.0.4): - - CocoaLumberjack - - SignalCoreKit - - HKDFKit/Tests (0.0.4): - - CocoaLumberjack - - SignalCoreKit - - libPhoneNumber-iOS (0.9.13) + - libPhoneNumber-iOS (0.9.15) - Mantle (2.1.0): - Mantle/extobjc (= 2.1.0) - Mantle/extobjc (2.1.0) @@ -75,59 +42,85 @@ PODS: - PureLayout (3.1.4) - Reachability (3.2) - SAMKeychain (1.5.3) - - SignalCoreKit (1.0.0): + - SessionAxolotlKit (1.0.1): + - CocoaLumberjack + - SessionCoreKit (~> 1.0.0) + - SessionCurve25519Kit (~> 2.1.1) + - SessionHKDFKit (~> 0.0.5) + - SwiftProtobuf (~> 1.5.0) + - SessionAxolotlKit/Tests (1.0.1): + - CocoaLumberjack + - SessionCoreKit (~> 1.0.0) + - SessionCurve25519Kit (~> 2.1.1) + - SessionHKDFKit (~> 0.0.5) + - SwiftProtobuf (~> 1.5.0) + - SessionCoreKit (1.0.0): - CocoaLumberjack - GRKOpenSSLFramework - - SignalCoreKit/Tests (1.0.0): + - SessionCoreKit/Tests (1.0.0): - CocoaLumberjack - GRKOpenSSLFramework - - SignalMetadataKit (1.0.0): - - AxolotlKit + - SessionCurve25519Kit (2.1.1): - CocoaLumberjack - - Curve25519Kit - - HKDFKit - - SignalCoreKit - - SwiftProtobuf - - SignalMetadataKit/Tests (1.0.0): - - AxolotlKit + - SessionCoreKit (~> 1.0.0) + - SessionCurve25519Kit/Tests (2.1.1): - CocoaLumberjack - - Curve25519Kit - - HKDFKit - - SignalCoreKit - - SwiftProtobuf - - SignalServiceKit (0.9.0): + - SessionCoreKit (~> 1.0.0) + - SessionHKDFKit (0.0.5): + - CocoaLumberjack + - SessionCoreKit + - SessionHKDFKit/Tests (0.0.5): + - CocoaLumberjack + - SessionCoreKit + - SessionMetadataKit (1.0.0): + - CocoaLumberjack + - CryptoSwift (~> 1.0) + - SessionAxolotlKit (~> 1.0.1) + - SessionCoreKit (~> 1.0.0) + - SessionCurve25519Kit (~> 2.1.1) + - SessionHKDFKit (~> 0.0.5) + - SwiftProtobuf (~> 1.5.0) + - SessionMetadataKit/Tests (1.0.0): + - CocoaLumberjack + - CryptoSwift (~> 1.0) + - SessionAxolotlKit (~> 1.0.1) + - SessionCoreKit (~> 1.0.0) + - SessionCurve25519Kit (~> 2.1.1) + - SessionHKDFKit (~> 0.0.5) + - SwiftProtobuf (~> 1.5.0) + - SessionServiceKit (1.0.0): - AFNetworking - - AxolotlKit - CocoaLumberjack - - CryptoSwift - - Curve25519Kit + - CryptoSwift (~> 1.0) - GRKOpenSSLFramework - libPhoneNumber-iOS - Mantle - PromiseKit (~> 6.0) - Reachability - SAMKeychain - - SignalCoreKit - - SignalMetadataKit + - SessionAxolotlKit (~> 1.0.1) + - SessionCoreKit (~> 1.0.0) + - SessionCurve25519Kit (~> 2.1.1) + - SessionMetadataKit (~> 1.0.0) - Starscream - - SwiftProtobuf + - SwiftProtobuf (~> 1.5.0) - YapDatabase/SQLCipher - - SignalServiceKit/Tests (0.9.0): + - SessionServiceKit/Tests (1.0.0): - AFNetworking - - AxolotlKit - CocoaLumberjack - - CryptoSwift - - Curve25519Kit + - CryptoSwift (~> 1.0) - GRKOpenSSLFramework - libPhoneNumber-iOS - Mantle - PromiseKit (~> 6.0) - Reachability - SAMKeychain - - SignalCoreKit - - SignalMetadataKit + - SessionAxolotlKit (~> 1.0.1) + - SessionCoreKit (~> 1.0.0) + - SessionCurve25519Kit (~> 2.1.1) + - SessionMetadataKit (~> 1.0.0) - Starscream - - SwiftProtobuf + - SwiftProtobuf (~> 1.5.0) - YapDatabase/SQLCipher - SQLCipher (4.1.0): - SQLCipher/standard (= 4.1.0) @@ -205,30 +198,27 @@ PODS: DEPENDENCIES: - AFNetworking - - AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) - - AxolotlKit/Tests (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) - - Crashlytics (~> 3.13) - CryptoSwift (~> 1.0) - - Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`) - - Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`) - - Fabric (~> 1.10) - FeedKit (~> 8.1) - - FirebaseCore (~> 6.0) - GCDWebServer (~> 3.0) - GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`) - - HKDFKit (from `https://github.com/signalapp/HKDFKit.git`) - - HKDFKit/Tests (from `https://github.com/signalapp/HKDFKit.git`) - Mantle (from `https://github.com/signalapp/Mantle`, branch `signal-master`) - NVActivityIndicatorView (~> 4.7) - PromiseKit (= 6.5.3) - PureLayout - Reachability - - SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`) - - SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit.git`) - - SignalMetadataKit (from `https://github.com/signalapp/SignalMetadataKit`) - - SignalMetadataKit/Tests (from `https://github.com/signalapp/SignalMetadataKit`) - - SignalServiceKit (from `.`) - - SignalServiceKit/Tests (from `.`) + - SessionAxolotlKit (from `https://github.com/loki-project/session-ios-protocol-kit.git`, branch `master`) + - SessionAxolotlKit/Tests (from `https://github.com/loki-project/session-ios-protocol-kit.git`, branch `master`) + - SessionCoreKit (from `https://github.com/loki-project/session-ios-core-kit.git`) + - SessionCoreKit/Tests (from `https://github.com/loki-project/session-ios-core-kit.git`) + - SessionCurve25519Kit (from `https://github.com/loki-project/session-ios-curve-25519-kit`) + - SessionCurve25519Kit/Tests (from `https://github.com/loki-project/session-ios-curve-25519-kit`) + - SessionHKDFKit (from `https://github.com/nielsandriesse/session-ios-hkdf-kit.git`) + - SessionHKDFKit/Tests (from `https://github.com/nielsandriesse/session-ios-hkdf-kit.git`) + - SessionMetadataKit (from `https://github.com/loki-project/session-ios-metadata-kit`) + - SessionMetadataKit/Tests (from `https://github.com/loki-project/session-ios-metadata-kit`) + - SessionServiceKit (from `.`) + - SessionServiceKit/Tests (from `.`) - SQLCipher (>= 4.0.1) - SSZipArchive - Starscream (from `https://github.com/signalapp/Starscream.git`, branch `signal-release`) @@ -239,13 +229,9 @@ SPEC REPOS: https://github.com/CocoaPods/Specs.git: - AFNetworking - CocoaLumberjack - - Crashlytics - CryptoSwift - - Fabric - FeedKit - - FirebaseCore - GCDWebServer - - GoogleUtilities - libPhoneNumber-iOS - NVActivityIndicatorView - PromiseKit @@ -258,23 +244,23 @@ SPEC REPOS: - YYImage EXTERNAL SOURCES: - AxolotlKit: - :branch: master - :git: https://github.com/signalapp/SignalProtocolKit.git - Curve25519Kit: - :git: https://github.com/signalapp/Curve25519Kit GRKOpenSSLFramework: :git: https://github.com/signalapp/GRKOpenSSLFramework - HKDFKit: - :git: https://github.com/signalapp/HKDFKit.git Mantle: :branch: signal-master :git: https://github.com/signalapp/Mantle - SignalCoreKit: - :git: https://github.com/signalapp/SignalCoreKit.git - SignalMetadataKit: - :git: https://github.com/signalapp/SignalMetadataKit - SignalServiceKit: + SessionAxolotlKit: + :branch: master + :git: https://github.com/loki-project/session-ios-protocol-kit.git + SessionCoreKit: + :git: https://github.com/loki-project/session-ios-core-kit.git + SessionCurve25519Kit: + :git: https://github.com/loki-project/session-ios-curve-25519-kit + SessionHKDFKit: + :git: https://github.com/nielsandriesse/session-ios-hkdf-kit.git + SessionMetadataKit: + :git: https://github.com/loki-project/session-ios-metadata-kit + SessionServiceKit: :path: "." Starscream: :branch: signal-release @@ -284,27 +270,27 @@ EXTERNAL SOURCES: :git: https://github.com/signalapp/YapDatabase.git CHECKOUT OPTIONS: - AxolotlKit: - :commit: dedb0f987ac98c8edafc8c54d442c01589cafffb - :git: https://github.com/signalapp/SignalProtocolKit.git - Curve25519Kit: - :commit: 9e5663baf4c2c7cb68ac4c0beb0423383c19a7fe - :git: https://github.com/signalapp/Curve25519Kit GRKOpenSSLFramework: :commit: b799c27e7927e5304ec1e4ad53c6d33c6fd1cae7 :git: https://github.com/signalapp/GRKOpenSSLFramework - HKDFKit: - :commit: 3e0c2371d125f2d3db26daa498d5d436961b1795 - :git: https://github.com/signalapp/HKDFKit.git Mantle: :commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef :git: https://github.com/signalapp/Mantle - SignalCoreKit: - :commit: 521615304b0448b5edcab43d7fcef7724c7dd10c - :git: https://github.com/signalapp/SignalCoreKit.git - SignalMetadataKit: - :commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62 - :git: https://github.com/signalapp/SignalMetadataKit + SessionAxolotlKit: + :commit: bdf16c39ed6af917362c22ebee7653ca25a7bec4 + :git: https://github.com/loki-project/session-ios-protocol-kit.git + SessionCoreKit: + :commit: 0d66c90657b62cb66ecd2767c57408a951650f23 + :git: https://github.com/loki-project/session-ios-core-kit.git + SessionCurve25519Kit: + :commit: 2c02fae0ddf2d390537b9114183a2e184d688f3e + :git: https://github.com/loki-project/session-ios-curve-25519-kit + SessionHKDFKit: + :commit: 0dcf8cf8a7995ef8663146f7063e6c1d7f5a3274 + :git: https://github.com/nielsandriesse/session-ios-hkdf-kit.git + SessionMetadataKit: + :commit: c7eda0c04764df707fb5bb2b91b7b0e323b623d4 + :git: https://github.com/loki-project/session-ios-metadata-kit Starscream: :commit: b09ea163c3cb305152c65b299cb024610f52e735 :git: https://github.com/signalapp/Starscream.git @@ -314,28 +300,24 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 - AxolotlKit: bb02741a93400b915df1be3365ad13d3768b0103 - CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947 - Crashlytics: 5aa8e90dcbf2f34898b4f5a0037787531246cca0 + CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9 CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f - Curve25519Kit: b3e77b7152ebe95fee2b3fb6c955449492bc14f7 - Fabric: f6f21452846788bb44595d73e9909d79d328e617 FeedKit: 3418eed25f0b493b205b4de1b8511ac21d413fa9 - FirebaseCore: b0f0262acebfa540e5f97b3832dbb13186980822 GCDWebServer: ead88cd14596dd4eae4f5830b8877c87c8728990 - GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e - HKDFKit: 3b6dbbb9d59c221cc6c52c3aa915700cbf24e376 - libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa + libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b NVActivityIndicatorView: b19ddab2576f805cbe0fb2306cba3476e09a1dea PromiseKit: c609029bdd801f792551a504c695c7d3098b42cd PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c - SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b - SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02 - SignalServiceKit: 5c5b63a39d5054201ab59ef6daf0fa0a1a0c7887 + SessionAxolotlKit: b43235dea1625352d3cfe727f8300e694e938d4e + SessionCoreKit: 778a3f6e3da788b43497734166646025b6392e88 + SessionCurve25519Kit: af73adf8d48094e627091eea759f4c64c5f4eb08 + SessionHKDFKit: b0f4e669411703ab925aba07491c5611564d1419 + SessionMetadataKit: d495323af8f24ef3832b68ffd4a58ecaf5e98707 + SessionServiceKit: 1c7c7c7f1c9f9f8de5c2331d406e6be31f388efe SQLCipher: efbdb52cdbe340bcd892b1b14297df4e07241b7f SSZipArchive: 8e859da2520142e09166bc9161967db296e9d02f Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 @@ -343,6 +325,6 @@ SPEC CHECKSUMS: YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 -PODFILE CHECKSUM: 472252f3a4801d0d14d9553ff33cf52ef0846dc3 +PODFILE CHECKSUM: c8ebeec5bbe6b9ba42d54a32e8547879a76cee30 -COCOAPODS: 1.9.0 +COCOAPODS: 1.9.3 diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index a808696ba..793415c75 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -3675,15 +3675,11 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Signal/Pods-Signal-frameworks.sh", "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", - "${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework", "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework", - "${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework", "${BUILT_PRODUCTS_DIR}/FeedKit/FeedKit.framework", "${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework", "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework", "${BUILT_PRODUCTS_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.framework", "${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework", @@ -3692,9 +3688,12 @@ "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", - "${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework", - "${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework", - "${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionAxolotlKit/SessionAxolotlKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionCoreKit/SessionCoreKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionCurve25519Kit/SessionCurve25519Kit.framework", + "${BUILT_PRODUCTS_DIR}/SessionHKDFKit/SessionHKDFKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionMetadataKit/SessionMetadataKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionServiceKit/SessionServiceKit.framework", "${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework", "${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework", "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework", @@ -3704,15 +3703,11 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FeedKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NVActivityIndicatorView.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework", @@ -3721,9 +3716,12 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionAxolotlKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCoreKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCurve25519Kit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionHKDFKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionMetadataKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionServiceKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", @@ -3761,21 +3759,21 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-SignalTests/Pods-SignalTests-frameworks.sh", "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", - "${BUILT_PRODUCTS_DIR}/AxolotlKit/AxolotlKit.framework", "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework", - "${BUILT_PRODUCTS_DIR}/Curve25519Kit/Curve25519Kit.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", - "${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework", "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework", "${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework", "${BUILT_PRODUCTS_DIR}/PureLayout/PureLayout.framework", "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework", "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SQLCipher/SQLCipher.framework", - "${BUILT_PRODUCTS_DIR}/SignalCoreKit/SignalCoreKit.framework", - "${BUILT_PRODUCTS_DIR}/SignalMetadataKit/SignalMetadataKit.framework", - "${BUILT_PRODUCTS_DIR}/SignalServiceKit/SignalServiceKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionAxolotlKit/SessionAxolotlKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionCoreKit/SessionCoreKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionCurve25519Kit/SessionCurve25519Kit.framework", + "${BUILT_PRODUCTS_DIR}/SessionHKDFKit/SessionHKDFKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionMetadataKit/SessionMetadataKit.framework", + "${BUILT_PRODUCTS_DIR}/SessionServiceKit/SessionServiceKit.framework", "${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework", "${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework", "${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework", @@ -3785,21 +3783,21 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AxolotlKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519Kit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PureLayout.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLCipher.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalCoreKit.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalMetadataKit.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalServiceKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionAxolotlKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCoreKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionCurve25519Kit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionHKDFKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionMetadataKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SessionServiceKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework", diff --git a/Signal/Signal-Prefix.pch b/Signal/Signal-Prefix.pch index e9d10ecf2..acba24111 100644 --- a/Signal/Signal-Prefix.pch +++ b/Signal/Signal-Prefix.pch @@ -15,11 +15,11 @@ static const NSUInteger ddLogLevel = DDLogLevelInfo; #endif - #import - #import - #import - #import - #import - #import - #import + #import + #import + #import + #import + #import + #import + #import #endif diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index dfb1d48f2..5d119525f 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -16,7 +16,7 @@ #import "SignalsNavigationController.h" #import "ViewControllerUtils.h" #import -#import +#import #import #import #import @@ -25,25 +25,25 @@ #import #import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import #import diff --git a/Signal/src/Jobs/MessageFetcherJob.swift b/Signal/src/Jobs/MessageFetcherJob.swift index 038859da1..a28d1a462 100644 --- a/Signal/src/Jobs/MessageFetcherJob.swift +++ b/Signal/src/Jobs/MessageFetcherJob.swift @@ -4,7 +4,7 @@ import Foundation import PromiseKit -import SignalServiceKit +import SessionServiceKit @objc(OWSMessageFetcherJob) public class MessageFetcherJob: NSObject { diff --git a/Signal/src/Jobs/OWSSessionResetJobRecord.h b/Signal/src/Jobs/OWSSessionResetJobRecord.h index 642200fc6..bcd134584 100644 --- a/Signal/src/Jobs/OWSSessionResetJobRecord.h +++ b/Signal/src/Jobs/OWSSessionResetJobRecord.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import @class TSContactThread; diff --git a/Signal/src/Jobs/OWSSessionResetJobRecord.m b/Signal/src/Jobs/OWSSessionResetJobRecord.m index e051a3b8d..f511a76ba 100644 --- a/Signal/src/Jobs/OWSSessionResetJobRecord.m +++ b/Signal/src/Jobs/OWSSessionResetJobRecord.m @@ -3,7 +3,7 @@ // #import "OWSSessionResetJobRecord.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/Jobs/SessionResetJob.swift b/Signal/src/Jobs/SessionResetJob.swift index ea194128b..8cd368ad0 100644 --- a/Signal/src/Jobs/SessionResetJob.swift +++ b/Signal/src/Jobs/SessionResetJob.swift @@ -4,7 +4,7 @@ import Foundation import PromiseKit -import SignalServiceKit +import SessionServiceKit @objc(OWSSessionResetJobQueue) public class SessionResetJobQueue: NSObject, JobQueue { diff --git a/Signal/src/Jobs/SyncPushTokensJob.swift b/Signal/src/Jobs/SyncPushTokensJob.swift index 14c457abf..9e39bd67a 100644 --- a/Signal/src/Jobs/SyncPushTokensJob.swift +++ b/Signal/src/Jobs/SyncPushTokensJob.swift @@ -3,7 +3,7 @@ // import PromiseKit -import SignalServiceKit +import SessionServiceKit @objc(OWSSyncPushTokensJob) class SyncPushTokensJob: NSObject { diff --git a/Signal/src/Models/AccountManager.swift b/Signal/src/Models/AccountManager.swift index 99d0f611b..333adee3f 100644 --- a/Signal/src/Models/AccountManager.swift +++ b/Signal/src/Models/AccountManager.swift @@ -4,7 +4,7 @@ import Foundation import PromiseKit -import SignalServiceKit +import SessionServiceKit /** * Signal is actually two services - textSecure for messages and red phone (for calls). diff --git a/Signal/src/Models/CompareSafetyNumbersActivity.swift b/Signal/src/Models/CompareSafetyNumbersActivity.swift index 6a2527e01..03ec848e7 100644 --- a/Signal/src/Models/CompareSafetyNumbersActivity.swift +++ b/Signal/src/Models/CompareSafetyNumbersActivity.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit let CompareSafetyNumbersActivityType = "org.whispersystems.signal.activity.CompareSafetyNumbers" diff --git a/Signal/src/Models/OWSDeviceProvisioningURLParser.m b/Signal/src/Models/OWSDeviceProvisioningURLParser.m index 3ae5d8665..03370563a 100644 --- a/Signal/src/Models/OWSDeviceProvisioningURLParser.m +++ b/Signal/src/Models/OWSDeviceProvisioningURLParser.m @@ -3,8 +3,8 @@ // #import "OWSDeviceProvisioningURLParser.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/Models/PhoneNumberValidator.swift b/Signal/src/Models/PhoneNumberValidator.swift index 4adf74387..7b66dcdf2 100644 --- a/Signal/src/Models/PhoneNumberValidator.swift +++ b/Signal/src/Models/PhoneNumberValidator.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public enum ValidatedPhoneCountryCodes: UInt { diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h index 22d9198bf..5c054d962 100644 --- a/Signal/src/Signal-Bridging-Header.h +++ b/Signal/src/Signal-Bridging-Header.h @@ -48,15 +48,15 @@ #import "SignalApp.h" #import "UIViewController+Permissions.h" #import "ViewControllerUtils.h" -#import +#import #import #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import #import #import #import @@ -75,59 +75,59 @@ #import #import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import #import #import diff --git a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m index ef695f94d..790203cf0 100644 --- a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m @@ -8,8 +8,8 @@ #import #import #import -#import -#import +#import +#import @implementation AboutTableViewController diff --git a/Signal/src/ViewControllers/AppSettings/AddToBlockListViewController.m b/Signal/src/ViewControllers/AppSettings/AddToBlockListViewController.m index ad42e26f7..af3f8fd60 100644 --- a/Signal/src/ViewControllers/AppSettings/AddToBlockListViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AddToBlockListViewController.m @@ -6,7 +6,7 @@ #import "BlockListUIUtils.h" #import "ContactsViewHelper.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m index 251ebab6d..3e007c583 100644 --- a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m @@ -13,7 +13,7 @@ #import #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m index c372b8925..37b9d4603 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m @@ -19,8 +19,8 @@ #import #import #import -#import -#import +#import +#import #import "Session-Swift.h" @interface AppSettingsViewController () diff --git a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m index 607583fff..5aac877df 100644 --- a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m +++ b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m @@ -14,8 +14,8 @@ #import "UIView+OWS.h" #import #import -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m b/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m index 1b96296ad..7897ed8a2 100644 --- a/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m +++ b/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m @@ -9,7 +9,7 @@ #import "UIFont+OWS.h" #import "UIView+OWS.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m index 794d75b68..fe8b58e91 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m @@ -13,7 +13,7 @@ #import #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m index c4f4dee4e..ad13d6f55 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m @@ -6,13 +6,13 @@ #import "OWSDeviceProvisioningURLParser.h" #import "OWSLinkedDevicesTableViewController.h" #import "Session-Swift.h" -#import +#import #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m index 2f4d4d914..cb7c7f5c3 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m @@ -7,11 +7,11 @@ #import "OWSLinkDeviceViewController.h" #import "Session-Swift.h" #import "UIViewController+Permissions.h" -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import #import #import #import diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 7c60d41a1..6a8fc551f 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -10,10 +10,10 @@ #import #import #import -#import -#import -#import -#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/AvatarViewHelper.m b/Signal/src/ViewControllers/AvatarViewHelper.m index 0292211e8..126813ac5 100644 --- a/Signal/src/ViewControllers/AvatarViewHelper.m +++ b/Signal/src/ViewControllers/AvatarViewHelper.m @@ -8,10 +8,10 @@ #import #import #import -#import -#import -#import -#import +#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/Call/CallViewController.swift b/Signal/src/ViewControllers/Call/CallViewController.swift index 16ffd1bf8..41d5a1738 100644 --- a/Signal/src/ViewControllers/Call/CallViewController.swift +++ b/Signal/src/ViewControllers/Call/CallViewController.swift @@ -5,7 +5,7 @@ //import Foundation //import WebRTC //import PromiseKit -//import SignalServiceKit +//import SessionServiceKit //import SignalMessaging // //// TODO: Add category so that button handlers can be defined where button is created. diff --git a/Signal/src/ViewControllers/ContactShareViewHelper.swift b/Signal/src/ViewControllers/ContactShareViewHelper.swift index 0db99098c..4f47a20b3 100644 --- a/Signal/src/ViewControllers/ContactShareViewHelper.swift +++ b/Signal/src/ViewControllers/ContactShareViewHelper.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import ContactsUI import MessageUI diff --git a/Signal/src/ViewControllers/ContactViewController.swift b/Signal/src/ViewControllers/ContactViewController.swift index 55973bc9e..02cbe788b 100644 --- a/Signal/src/ViewControllers/ContactViewController.swift +++ b/Signal/src/ViewControllers/ContactViewController.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging import Reachability import ContactsUI diff --git a/Signal/src/ViewControllers/ContactsPicker.swift b/Signal/src/ViewControllers/ContactsPicker.swift index 1ec660512..b08b8c557 100644 --- a/Signal/src/ViewControllers/ContactsPicker.swift +++ b/Signal/src/ViewControllers/ContactsPicker.swift @@ -9,7 +9,7 @@ import UIKit import Contacts -import SignalServiceKit +import SessionServiceKit @objc public protocol ContactsPickerDelegate: class { diff --git a/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m b/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m index b3b4a5432..3d992a974 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m @@ -7,9 +7,9 @@ #import "OWSProgressView.h" #import #import -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m index 3adce8cf8..cc1f65ee0 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m @@ -9,7 +9,7 @@ #import "ViewControllerUtils.h" #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m index 63678983f..5e49456bf 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m @@ -10,7 +10,7 @@ #import #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m index ba699921a..a24cc1d9f 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m @@ -11,7 +11,7 @@ #import #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m index 170fe861e..260612e15 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m @@ -10,9 +10,9 @@ #import "ViewControllerUtils.h" #import #import -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index 1b35b058e..80f5dd245 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m @@ -7,7 +7,7 @@ #import "OWSMessageBubbleView.h" #import "OWSMessageHeaderView.h" #import "Session-Swift.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m index 0c8647de0..aa29f7f37 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m @@ -8,8 +8,8 @@ #import "UIColor+OWS.h" #import "UIView+OWS.h" #import -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m index f8e54485b..a9a6b0c6d 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m @@ -11,9 +11,9 @@ #import #import #import -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m index 5cf13578b..f67a4782a 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m @@ -11,10 +11,10 @@ #import "UIView+OWS.h" #import #import -#import -#import -#import -#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m index ce3840210..05da1d9d5 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m @@ -4,7 +4,7 @@ #import "ConversationInputTextView.h" #import "Session-Swift.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 2b4fa64d0..d843ee63d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -15,8 +15,8 @@ #import #import #import -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index e57323112..e45f7c22c 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -47,8 +47,8 @@ #import #import #import -#import -#import +#import +#import #import #import #import @@ -60,35 +60,35 @@ #import #import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import #import #import #import -#import +#import @import Photos; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index 40b35170e..0025c5206 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -11,12 +11,12 @@ #import "Session-Swift.h" #import "AnyPromise.h" #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index b0674590d..af1319725 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -8,21 +8,21 @@ #import "OWSMessageBubbleView.h" #import "OWSQuotedReplyModel.h" #import "Session-Swift.h" -#import +#import #import #import #import #import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m index d21b2bd64..126809c9f 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m +++ b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m @@ -5,7 +5,7 @@ #import "DebugContactsUtils.h" #import "Session-Swift.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m b/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m index ead566d0c..21a4f518c 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m @@ -7,7 +7,7 @@ #import "OWSTableViewController.h" #import "Session-Swift.h" #import -#import +#import @import CloudKit; diff --git a/Signal/src/ViewControllers/DebugUI/DebugUICalling.swift b/Signal/src/ViewControllers/DebugUI/DebugUICalling.swift index de8e514f5..ee9ef5826 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUICalling.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUICalling.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging class DebugUICalling: DebugUIPage { diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m index c2e6438a2..d3f55f929 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m @@ -8,7 +8,7 @@ #import "Session-Swift.h" #import "SignalApp.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m index b2955a2af..48be5eb9d 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m @@ -6,10 +6,10 @@ #import "OWSOrphanDataCleaner.h" #import "OWSTableViewController.h" #import "Session-Swift.h" -#import -#import -#import -#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index c91328dda..678e4d28b 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -9,21 +9,21 @@ #import "DebugUIMessagesAssetLoader.h" #import "OWSTableViewController.h" #import "Session-Swift.h" -#import -#import +#import +#import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.m index 664728348..20865b906 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.m @@ -3,7 +3,7 @@ // #import "DebugUIMessagesAction.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m index e851c553a..7685b5ccb 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.m @@ -6,11 +6,11 @@ #import #import #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m index 43b2d183e..ac8b33d2f 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m @@ -9,17 +9,17 @@ #import "OWSTableViewController.h" #import "Session-Swift.h" #import "ThreadUtil.h" -#import +#import #import #import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift b/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift index 6465bbe3d..b2d2091cb 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging import PromiseKit diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift b/Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift index 7fb9a30a3..417e3d3dc 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging class DebugUIProfile: DebugUIPage { diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m index 40b6a08a3..41bb5ca6a 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m @@ -5,9 +5,9 @@ #import "DebugUISessionState.h" #import "OWSTableViewController.h" #import "Session-Swift.h" -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m index ebcfb84af..1c0adad1e 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m @@ -7,16 +7,16 @@ #import "OWSTableViewController.h" #import "SignalApp.h" #import "ThreadUtil.h" -#import -#import -#import +#import +#import +#import #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m index 124f14c86..4b5347f71 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m @@ -7,26 +7,26 @@ #import "OWSTableViewController.h" #import "Session-Swift.h" #import "ThreadUtil.h" -#import +#import #import -#import +#import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m index 39e895ec4..99dd245f6 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m @@ -12,8 +12,8 @@ #import "DebugUIStress.h" #import "DebugUISyncMessages.h" #import "Session-Swift.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/GifPicker/GifPickerCell.swift b/Signal/src/ViewControllers/GifPicker/GifPickerCell.swift index e2cdb5f59..a3a755296 100644 --- a/Signal/src/ViewControllers/GifPicker/GifPickerCell.swift +++ b/Signal/src/ViewControllers/GifPicker/GifPickerCell.swift @@ -4,7 +4,7 @@ import Foundation import PromiseKit -import SignalServiceKit +import SessionServiceKit import SignalMessaging import YYImage diff --git a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift index c4420c3b0..b2c57a038 100644 --- a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift +++ b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import Reachability import SignalMessaging import PromiseKit diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m index 93929942f..059eb093c 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m @@ -8,10 +8,10 @@ #import #import #import -#import -#import -#import -#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 4e414cc4d..eb3c3abfa 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -18,18 +18,18 @@ #import "TSGroupThread.h" #import "ViewControllerUtils.h" #import -#import -#import -#import +#import +#import +#import #import #import #import #import #import -#import -#import -#import -#import +#import +#import +#import +#import #import #import #import diff --git a/Signal/src/ViewControllers/InviteFlow.swift b/Signal/src/ViewControllers/InviteFlow.swift index 34e4844e4..9bab89a84 100644 --- a/Signal/src/ViewControllers/InviteFlow.swift +++ b/Signal/src/ViewControllers/InviteFlow.swift @@ -6,7 +6,7 @@ import Foundation import Social import ContactsUI import MessageUI -import SignalServiceKit +import SessionServiceKit @objc(OWSInviteFlow) class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailComposeViewControllerDelegate, ContactsPickerDelegate { diff --git a/Signal/src/ViewControllers/LongTextViewController.swift b/Signal/src/ViewControllers/LongTextViewController.swift index 470accb16..2cb129d7a 100644 --- a/Signal/src/ViewControllers/LongTextViewController.swift +++ b/Signal/src/ViewControllers/LongTextViewController.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging @objc diff --git a/Signal/src/ViewControllers/MediaDetailViewController.m b/Signal/src/ViewControllers/MediaDetailViewController.m index c79cdd908..55529e949 100644 --- a/Signal/src/ViewControllers/MediaDetailViewController.m +++ b/Signal/src/ViewControllers/MediaDetailViewController.m @@ -17,7 +17,7 @@ #import #import #import -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift index 8efc76090..13ef99026 100644 --- a/Signal/src/ViewControllers/MessageDetailViewController.swift +++ b/Signal/src/ViewControllers/MessageDetailViewController.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging @objc diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m index 9fdb22e2b..38427d03e 100644 --- a/Signal/src/ViewControllers/NewContactThreadViewController.m +++ b/Signal/src/ViewControllers/NewContactThreadViewController.m @@ -15,11 +15,11 @@ #import #import #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m index 141ff8add..f8d66bd0c 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.m +++ b/Signal/src/ViewControllers/NewGroupViewController.m @@ -8,8 +8,8 @@ #import "OWSNavigationController.h" #import "Session-Swift.h" #import "SignalApp.h" -#import -#import +#import +#import #import #import #import @@ -20,12 +20,12 @@ #import #import #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/OWS2FASettingsViewController.m b/Signal/src/ViewControllers/OWS2FASettingsViewController.m index e090b7ecd..7614de56b 100644 --- a/Signal/src/ViewControllers/OWS2FASettingsViewController.m +++ b/Signal/src/ViewControllers/OWS2FASettingsViewController.m @@ -11,8 +11,8 @@ #import #import #import -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index 85ef8ea6c..803cc651b 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -12,14 +12,14 @@ #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" -#import +#import #import #import #import #import #import -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift b/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift index ae336c3cc..a802dba0f 100644 --- a/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift +++ b/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public class SafetyNumberConfirmationAlert: NSObject { diff --git a/Signal/src/ViewControllers/SignalsNavigationController.m b/Signal/src/ViewControllers/SignalsNavigationController.m index 095c1b757..28d44bc4a 100644 --- a/Signal/src/ViewControllers/SignalsNavigationController.m +++ b/Signal/src/ViewControllers/SignalsNavigationController.m @@ -5,9 +5,9 @@ #import "SignalsNavigationController.h" #import "Session-Swift.h" #import -#import -#import -#import +#import +#import +#import static double const STALLED_PROGRESS = 0.9; diff --git a/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.m index 43c3af5c5..8c3f6bb50 100644 --- a/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.m @@ -7,7 +7,7 @@ #import "ContactsViewHelper.h" #import "Session-Swift.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m index 6aa4b4d63..bc09ebac1 100644 --- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m @@ -9,17 +9,17 @@ #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" -#import +#import #import #import #import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m index 7a399fce6..1ef96889f 100644 --- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m +++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m @@ -12,10 +12,10 @@ #import #import #import -#import -#import -#import -#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index 123e4df72..792bf68cf 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -15,8 +15,8 @@ #import "UIFont+OWS.h" #import "UIView+OWS.h" #import "UpdateGroupViewController.h" -#import -#import +#import +#import #import #import #import @@ -25,13 +25,13 @@ #import #import #import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import @import ContactsUI; diff --git a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m index beca2be95..1aae1bf56 100644 --- a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m @@ -12,10 +12,10 @@ #import #import #import -#import -#import -#import -#import +#import +#import +#import +#import @import ContactsUI; diff --git a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m index a55c240d2..b4354de0d 100644 --- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m @@ -8,7 +8,7 @@ #import "OWSNavigationController.h" #import "Session-Swift.h" #import "ViewControllerUtils.h" -#import +#import #import #import #import @@ -19,12 +19,12 @@ #import #import #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift index c00e5cc14..6369b5870 100644 --- a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift +++ b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging @objc public enum MessageReceiptStatus: Int { diff --git a/Signal/src/call/CallAudioService.swift b/Signal/src/call/CallAudioService.swift index e79b72314..a6b8bc660 100644 --- a/Signal/src/call/CallAudioService.swift +++ b/Signal/src/call/CallAudioService.swift @@ -4,7 +4,7 @@ // //import Foundation //import AVFoundation -//import SignalServiceKit +//import SessionServiceKit //import SignalMessaging // //struct AudioSource: Hashable { diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index 0b98d99ac..8503c18ea 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -5,7 +5,7 @@ //import Foundation //import PromiseKit //import WebRTC -//import SignalServiceKit +//import SessionServiceKit //import SignalMessaging // ///** diff --git a/Signal/src/call/NonCallKitCallUIAdaptee.swift b/Signal/src/call/NonCallKitCallUIAdaptee.swift index 5b254ec3f..87a754e30 100644 --- a/Signal/src/call/NonCallKitCallUIAdaptee.swift +++ b/Signal/src/call/NonCallKitCallUIAdaptee.swift @@ -3,7 +3,7 @@ //// // //import Foundation -//import SignalServiceKit +//import SessionServiceKit //import SignalMessaging // ///** diff --git a/Signal/src/call/OutboundCallInitiator.swift b/Signal/src/call/OutboundCallInitiator.swift index 2c6d94865..958379d38 100644 --- a/Signal/src/call/OutboundCallInitiator.swift +++ b/Signal/src/call/OutboundCallInitiator.swift @@ -3,7 +3,7 @@ //// // //import Foundation -//import SignalServiceKit +//import SessionServiceKit //import SignalMessaging // ///** diff --git a/Signal/src/call/PeerConnectionClient.swift b/Signal/src/call/PeerConnectionClient.swift index 2a7671779..9b9ff53a8 100644 --- a/Signal/src/call/PeerConnectionClient.swift +++ b/Signal/src/call/PeerConnectionClient.swift @@ -5,7 +5,7 @@ //import Foundation //import PromiseKit //import WebRTC -//import SignalServiceKit +//import SessionServiceKit //import SignalMessaging // //// HACK - Seeing crazy SEGFAULTs on iOS9 when accessing these objc externs. diff --git a/Signal/src/call/SignalCall.swift b/Signal/src/call/SignalCall.swift index 7db05ea67..2c3511305 100644 --- a/Signal/src/call/SignalCall.swift +++ b/Signal/src/call/SignalCall.swift @@ -3,7 +3,7 @@ //// // //import Foundation -//import SignalServiceKit +//import SessionServiceKit // //public enum CallState: String { // case idle diff --git a/Signal/src/call/Speakerbox/CallKitCallManager.swift b/Signal/src/call/Speakerbox/CallKitCallManager.swift index 3b69e3ee1..50c78984f 100644 --- a/Signal/src/call/Speakerbox/CallKitCallManager.swift +++ b/Signal/src/call/Speakerbox/CallKitCallManager.swift @@ -4,7 +4,7 @@ // //import UIKit //import CallKit -//import SignalServiceKit +//import SessionServiceKit // ///** // * Requests actions from CallKit diff --git a/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift b/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift index b6f372144..759179925 100644 --- a/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift +++ b/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift @@ -6,7 +6,7 @@ //import UIKit //import CallKit //import AVFoundation -//import SignalServiceKit +//import SessionServiceKit //import SignalMessaging // ///** diff --git a/Signal/src/call/UserInterface/CallUIAdapter.swift b/Signal/src/call/UserInterface/CallUIAdapter.swift index 7fa1270b1..99bea1dd5 100644 --- a/Signal/src/call/UserInterface/CallUIAdapter.swift +++ b/Signal/src/call/UserInterface/CallUIAdapter.swift @@ -5,7 +5,7 @@ //import Foundation //import PromiseKit //import CallKit -//import SignalServiceKit +//import SessionServiceKit //import SignalMessaging //import WebRTC // diff --git a/Signal/src/call/WebRTCCallMessageHandler.swift b/Signal/src/call/WebRTCCallMessageHandler.swift index ff44d30c5..7cafb5d7e 100644 --- a/Signal/src/call/WebRTCCallMessageHandler.swift +++ b/Signal/src/call/WebRTCCallMessageHandler.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging @objc(OWSWebRTCCallMessageHandler) diff --git a/Signal/src/environment/AppEnvironment.swift b/Signal/src/environment/AppEnvironment.swift index 0211eda87..a564d61ec 100644 --- a/Signal/src/environment/AppEnvironment.swift +++ b/Signal/src/environment/AppEnvironment.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging @objc public class AppEnvironment: NSObject { diff --git a/Signal/src/environment/ExperienceUpgrades/ExperienceUpgrade.swift b/Signal/src/environment/ExperienceUpgrades/ExperienceUpgrade.swift index c7c6130f9..46b86a059 100644 --- a/Signal/src/environment/ExperienceUpgrades/ExperienceUpgrade.swift +++ b/Signal/src/environment/ExperienceUpgrades/ExperienceUpgrade.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import SignalMessaging @objc public class ExperienceUpgrade: TSYapDatabaseObject { diff --git a/Signal/src/environment/ExperienceUpgrades/ExperienceUpgradeFinder.swift b/Signal/src/environment/ExperienceUpgrades/ExperienceUpgradeFinder.swift index ea55bfc09..365b7e4ce 100644 --- a/Signal/src/environment/ExperienceUpgrades/ExperienceUpgradeFinder.swift +++ b/Signal/src/environment/ExperienceUpgrades/ExperienceUpgradeFinder.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit enum ExperienceUpgradeId: String { case videoCalling = "001", diff --git a/Signal/src/environment/PushRegistrationManager.swift b/Signal/src/environment/PushRegistrationManager.swift index 856719d9a..9e0419fce 100644 --- a/Signal/src/environment/PushRegistrationManager.swift +++ b/Signal/src/environment/PushRegistrationManager.swift @@ -5,7 +5,7 @@ import Foundation import PromiseKit import PushKit -import SignalServiceKit +import SessionServiceKit import SignalMessaging public enum PushRegistrationError: Error { diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m index 5ddbe5fee..9bba0cdbf 100644 --- a/Signal/src/environment/SignalApp.m +++ b/Signal/src/environment/SignalApp.m @@ -7,12 +7,12 @@ #import "ConversationViewController.h" #import "Session-Swift.h" #import "SignalsNavigationController.h" -#import +#import #import #import -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/network/GiphyDownloader.swift b/Signal/src/network/GiphyDownloader.swift index 69a6c958f..ca38a93b1 100644 --- a/Signal/src/network/GiphyDownloader.swift +++ b/Signal/src/network/GiphyDownloader.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public class GiphyDownloader: ProxiedContentDownloader { diff --git a/Signal/src/util/Backup/OWSBackup.m b/Signal/src/util/Backup/OWSBackup.m index 6296da6e9..02f242281 100644 --- a/Signal/src/util/Backup/OWSBackup.m +++ b/Signal/src/util/Backup/OWSBackup.m @@ -8,9 +8,9 @@ #import "OWSBackupImportJob.h" #import "Session-Swift.h" #import -#import -#import -#import +#import +#import +#import @import CloudKit; diff --git a/Signal/src/util/Backup/OWSBackupAPI.swift b/Signal/src/util/Backup/OWSBackupAPI.swift index 777d96ee0..b5837083a 100644 --- a/Signal/src/util/Backup/OWSBackupAPI.swift +++ b/Signal/src/util/Backup/OWSBackupAPI.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit import CloudKit import PromiseKit diff --git a/Signal/src/util/Backup/OWSBackupExportJob.m b/Signal/src/util/Backup/OWSBackupExportJob.m index a9fd24eff..dd85d9f70 100644 --- a/Signal/src/util/Backup/OWSBackupExportJob.m +++ b/Signal/src/util/Backup/OWSBackupExportJob.m @@ -7,16 +7,16 @@ #import "OWSDatabaseMigration.h" #import "Session-Swift.h" #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import @import CloudKit; diff --git a/Signal/src/util/Backup/OWSBackupIO.m b/Signal/src/util/Backup/OWSBackupIO.m index 14c903c3e..8e43ebe48 100644 --- a/Signal/src/util/Backup/OWSBackupIO.m +++ b/Signal/src/util/Backup/OWSBackupIO.m @@ -3,8 +3,8 @@ // #import "OWSBackupIO.h" -#import -#import +#import +#import @import Compression; diff --git a/Signal/src/util/Backup/OWSBackupImportJob.m b/Signal/src/util/Backup/OWSBackupImportJob.m index 0cca6f2de..8b9d6a15d 100644 --- a/Signal/src/util/Backup/OWSBackupImportJob.m +++ b/Signal/src/util/Backup/OWSBackupImportJob.m @@ -8,12 +8,12 @@ #import "OWSDatabaseMigrationRunner.h" #import "Session-Swift.h" #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/Backup/OWSBackupJob.h b/Signal/src/util/Backup/OWSBackupJob.h index f82ce0ccf..9e14ba532 100644 --- a/Signal/src/util/Backup/OWSBackupJob.h +++ b/Signal/src/util/Backup/OWSBackupJob.h @@ -3,7 +3,7 @@ // #import "TSYapDatabaseObject.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/Backup/OWSBackupJob.m b/Signal/src/util/Backup/OWSBackupJob.m index 92aab7714..76790d493 100644 --- a/Signal/src/util/Backup/OWSBackupJob.m +++ b/Signal/src/util/Backup/OWSBackupJob.m @@ -6,7 +6,7 @@ #import "OWSBackupIO.h" #import "Session-Swift.h" #import -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/Backup/OWSBackupLazyRestore.swift b/Signal/src/util/Backup/OWSBackupLazyRestore.swift index 4b19442d6..b3c5a82b0 100644 --- a/Signal/src/util/Backup/OWSBackupLazyRestore.swift +++ b/Signal/src/util/Backup/OWSBackupLazyRestore.swift @@ -4,7 +4,7 @@ import Foundation import PromiseKit -import SignalServiceKit +import SessionServiceKit @objc(OWSBackupLazyRestore) public class BackupLazyRestore: NSObject { diff --git a/Signal/src/util/DateUtil.m b/Signal/src/util/DateUtil.m index fd896fe0e..66aa0286d 100644 --- a/Signal/src/util/DateUtil.m +++ b/Signal/src/util/DateUtil.m @@ -3,9 +3,9 @@ // #import "DateUtil.h" -#import +#import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/MainAppContext.h b/Signal/src/util/MainAppContext.h index 45ba1a8e5..3349df4e0 100644 --- a/Signal/src/util/MainAppContext.h +++ b/Signal/src/util/MainAppContext.h @@ -2,7 +2,7 @@ // Copyright (c) 2019 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m index 7a7139312..399f27ed2 100644 --- a/Signal/src/util/MainAppContext.m +++ b/Signal/src/util/MainAppContext.m @@ -4,11 +4,11 @@ #import "MainAppContext.h" #import "Session-Swift.h" -#import +#import #import #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/OWSAnalytics.swift b/Signal/src/util/OWSAnalytics.swift index 27e91d230..045a17cb7 100644 --- a/Signal/src/util/OWSAnalytics.swift +++ b/Signal/src/util/OWSAnalytics.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit func FormatAnalyticsLocation(file: String, function: String) -> NSString { return "\((file as NSString).lastPathComponent):\(function)" as NSString diff --git a/Signal/src/util/OWSOrphanDataCleaner.m b/Signal/src/util/OWSOrphanDataCleaner.m index 9f02179fb..f901f7524 100644 --- a/Signal/src/util/OWSOrphanDataCleaner.m +++ b/Signal/src/util/OWSOrphanDataCleaner.m @@ -4,20 +4,20 @@ #import "OWSOrphanDataCleaner.h" #import "DateUtil.h" -#import +#import #import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/Pastelog.m b/Signal/src/util/Pastelog.m index 24336da28..f6b76ec5c 100644 --- a/Signal/src/util/Pastelog.m +++ b/Signal/src/util/Pastelog.m @@ -8,15 +8,15 @@ #import "zlib.h" #import #import -#import +#import #import #import #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/RegistrationUtils.m b/Signal/src/util/RegistrationUtils.m index 888d3bdec..8c0272d6a 100644 --- a/Signal/src/util/RegistrationUtils.m +++ b/Signal/src/util/RegistrationUtils.m @@ -8,7 +8,7 @@ #import #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/UIViewController+Permissions.m b/Signal/src/util/UIViewController+Permissions.m index 607d9bb7d..99e756fb5 100644 --- a/Signal/src/util/UIViewController+Permissions.m +++ b/Signal/src/util/UIViewController+Permissions.m @@ -6,7 +6,7 @@ #import "Session-Swift.h" #import #import -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/views/AudioProgressView.swift b/Signal/src/views/AudioProgressView.swift index 7741f6da1..553e14032 100644 --- a/Signal/src/views/AudioProgressView.swift +++ b/Signal/src/views/AudioProgressView.swift @@ -3,7 +3,7 @@ // import UIKit -import SignalServiceKit +import SessionServiceKit @objc public class AudioProgressView: UIView { diff --git a/Signal/src/views/ContactCell.swift b/Signal/src/views/ContactCell.swift index f796f20f5..d16c37599 100644 --- a/Signal/src/views/ContactCell.swift +++ b/Signal/src/views/ContactCell.swift @@ -4,7 +4,7 @@ import UIKit import Contacts -import SignalServiceKit +import SessionServiceKit class ContactCell: UITableViewCell { diff --git a/Signal/src/views/GroupTableViewCell.swift b/Signal/src/views/GroupTableViewCell.swift index fabb39117..4b7fe69b0 100644 --- a/Signal/src/views/GroupTableViewCell.swift +++ b/Signal/src/views/GroupTableViewCell.swift @@ -3,7 +3,7 @@ // import UIKit -import SignalServiceKit +import SessionServiceKit @objc class GroupTableViewCell: UITableViewCell { diff --git a/Signal/src/views/OWSDeviceTableViewCell.h b/Signal/src/views/OWSDeviceTableViewCell.h index 12caed02c..e9d0a8524 100644 --- a/Signal/src/views/OWSDeviceTableViewCell.h +++ b/Signal/src/views/OWSDeviceTableViewCell.h @@ -2,7 +2,7 @@ // Copyright (c) 2019 Open Whisper Systems. All rights reserved. // -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/views/OWSProgressView.m b/Signal/src/views/OWSProgressView.m index bfb2454fa..422754669 100644 --- a/Signal/src/views/OWSProgressView.m +++ b/Signal/src/views/OWSProgressView.m @@ -4,7 +4,7 @@ #import "OWSProgressView.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/views/RemoteVideoView.m b/Signal/src/views/RemoteVideoView.m index 4104d5ad0..a390e3c0f 100644 --- a/Signal/src/views/RemoteVideoView.m +++ b/Signal/src/views/RemoteVideoView.m @@ -7,7 +7,7 @@ #import "UIView+OWS.h" #import #import -#import +#import #import #import #import diff --git a/Signal/test/Models/MantlePerfTest.swift b/Signal/test/Models/MantlePerfTest.swift index d0e6eadaa..4cafdbaed 100644 --- a/Signal/test/Models/MantlePerfTest.swift +++ b/Signal/test/Models/MantlePerfTest.swift @@ -4,7 +4,7 @@ import XCTest @testable import SignalMessaging -@testable import SignalServiceKit +@testable import SessionServiceKit class MantlePerfTest: SignalBaseTest { diff --git a/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m b/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m index 331791112..3eca92cec 100644 --- a/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m +++ b/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m @@ -4,7 +4,7 @@ #import "OWSDeviceProvisioningURLParser.h" #import "SignalBaseTest.h" -#import +#import @interface OWSDeviceProvisioningURLParserTest : SignalBaseTest diff --git a/Signal/test/SSKTests/SSKProtoEnvelopeTest.swift b/Signal/test/SSKTests/SSKProtoEnvelopeTest.swift index e1b978e03..8b7ebe9f7 100644 --- a/Signal/test/SSKTests/SSKProtoEnvelopeTest.swift +++ b/Signal/test/SSKTests/SSKProtoEnvelopeTest.swift @@ -4,7 +4,7 @@ import XCTest -import SignalServiceKit +import SessionServiceKit import SwiftProtobuf class SSKProtoEnvelopeTest: SignalBaseTest { diff --git a/Signal/test/SignalBaseTest.h b/Signal/test/SignalBaseTest.h index 15fa1628f..6879e8c49 100644 --- a/Signal/test/SignalBaseTest.h +++ b/Signal/test/SignalBaseTest.h @@ -3,7 +3,7 @@ // #import "MockEnvironment.h" -#import +#import #import #import diff --git a/Signal/test/SignalBaseTest.m b/Signal/test/SignalBaseTest.m index d15bd17c8..ccc197779 100644 --- a/Signal/test/SignalBaseTest.m +++ b/Signal/test/SignalBaseTest.m @@ -4,8 +4,8 @@ #import "SignalBaseTest.h" #import "Environment.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/test/ViewControllers/ConversationViewItemTest.m b/Signal/test/ViewControllers/ConversationViewItemTest.m index 646655b6e..2813badc4 100644 --- a/Signal/test/ViewControllers/ConversationViewItemTest.m +++ b/Signal/test/ViewControllers/ConversationViewItemTest.m @@ -6,11 +6,11 @@ #import "SignalBaseTest.h" #import #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import #import /* diff --git a/Signal/test/util/CDSSigningCertificateTest.m b/Signal/test/util/CDSSigningCertificateTest.m index 7f0e6c014..892d1e1a1 100644 --- a/Signal/test/util/CDSSigningCertificateTest.m +++ b/Signal/test/util/CDSSigningCertificateTest.m @@ -3,8 +3,8 @@ // #import "SignalBaseTest.h" -#import -#import +#import +#import @interface CDSSigningCertificateTest : SignalBaseTest diff --git a/Signal/test/util/OWSDatabaseConverterTest.m b/Signal/test/util/OWSDatabaseConverterTest.m index c55c3589a..48474378b 100644 --- a/Signal/test/util/OWSDatabaseConverterTest.m +++ b/Signal/test/util/OWSDatabaseConverterTest.m @@ -3,11 +3,11 @@ // #import "SignalBaseTest.h" -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import #import #import #import diff --git a/Signal/test/util/OWSOrphanDataCleanerTest.m b/Signal/test/util/OWSOrphanDataCleanerTest.m index ee5afebb7..1a6b0e733 100644 --- a/Signal/test/util/OWSOrphanDataCleanerTest.m +++ b/Signal/test/util/OWSOrphanDataCleanerTest.m @@ -4,11 +4,11 @@ #import "OWSOrphanDataCleaner.h" #import "SignalBaseTest.h" -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import @interface OWSOrphanDataCleaner (Test) diff --git a/Signal/test/util/ProtoParsingTest.m b/Signal/test/util/ProtoParsingTest.m index 6e06aebbc..e8bc779ce 100644 --- a/Signal/test/util/ProtoParsingTest.m +++ b/Signal/test/util/ProtoParsingTest.m @@ -3,13 +3,13 @@ // #import "SignalBaseTest.h" -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/test/util/UtilTest.m b/Signal/test/util/UtilTest.m index e743003c9..0c3f3a288 100644 --- a/Signal/test/util/UtilTest.m +++ b/Signal/test/util/UtilTest.m @@ -5,9 +5,9 @@ #import "UtilTest.h" #import "DateUtil.h" #import "TestUtil.h" -#import -#import -#import +#import +#import +#import @interface DateUtil (Test) diff --git a/SignalMessaging/Loki/Migrations/LK001UpdateFriendRequestStatusStorage.swift b/SignalMessaging/Loki/Migrations/LK001UpdateFriendRequestStatusStorage.swift index 5914e0dc8..4878ad16d 100644 --- a/SignalMessaging/Loki/Migrations/LK001UpdateFriendRequestStatusStorage.swift +++ b/SignalMessaging/Loki/Migrations/LK001UpdateFriendRequestStatusStorage.swift @@ -1,5 +1,5 @@ import Foundation -import SignalServiceKit +import SessionServiceKit @objc public class LK001UpdateFriendRequestStatusStorage : OWSDatabaseMigration { diff --git a/SignalMessaging/Models/OWSContactOffersInteraction.h b/SignalMessaging/Models/OWSContactOffersInteraction.h index c6c19cd61..71bba6802 100644 --- a/SignalMessaging/Models/OWSContactOffersInteraction.h +++ b/SignalMessaging/Models/OWSContactOffersInteraction.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import @class YapDatabaseReadWriteTransaction; diff --git a/SignalMessaging/Models/TSUnreadIndicatorInteraction.h b/SignalMessaging/Models/TSUnreadIndicatorInteraction.h index f4134e4bb..772568de9 100644 --- a/SignalMessaging/Models/TSUnreadIndicatorInteraction.h +++ b/SignalMessaging/Models/TSUnreadIndicatorInteraction.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/SignalMessaging-Prefix.pch b/SignalMessaging/SignalMessaging-Prefix.pch index 3d083f577..cb9007d47 100644 --- a/SignalMessaging/SignalMessaging-Prefix.pch +++ b/SignalMessaging/SignalMessaging-Prefix.pch @@ -15,8 +15,8 @@ static const NSUInteger ddLogLevel = DDLogLevelInfo; #endif - #import - #import - #import - #import + #import + #import + #import + #import #endif diff --git a/SignalMessaging/SignalMessaging.h b/SignalMessaging/SignalMessaging.h index 5416e1aae..092dcdeb1 100644 --- a/SignalMessaging/SignalMessaging.h +++ b/SignalMessaging/SignalMessaging.h @@ -58,4 +58,4 @@ FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[]; #import #import #import -#import +#import diff --git a/SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift b/SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift index d44b1519d..187b64b9c 100644 --- a/SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public protocol ContactShareApprovalViewControllerDelegate: class { diff --git a/SignalMessaging/ViewControllers/CountryCodeViewController.m b/SignalMessaging/ViewControllers/CountryCodeViewController.m index 264c2d316..011114d9b 100644 --- a/SignalMessaging/ViewControllers/CountryCodeViewController.m +++ b/SignalMessaging/ViewControllers/CountryCodeViewController.m @@ -9,7 +9,7 @@ #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/ViewControllers/EditContactShareNameViewController.swift b/SignalMessaging/ViewControllers/EditContactShareNameViewController.swift index 1a2b19df8..360dec3f5 100644 --- a/SignalMessaging/ViewControllers/EditContactShareNameViewController.swift +++ b/SignalMessaging/ViewControllers/EditContactShareNameViewController.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public protocol ContactNameFieldViewDelegate: class { diff --git a/SignalMessaging/ViewControllers/MediaMessageView.swift b/SignalMessaging/ViewControllers/MediaMessageView.swift index 1b44ac446..d1a3d5fa1 100644 --- a/SignalMessaging/ViewControllers/MediaMessageView.swift +++ b/SignalMessaging/ViewControllers/MediaMessageView.swift @@ -5,7 +5,7 @@ import Foundation import MediaPlayer import YYImage -import SignalServiceKit +import SessionServiceKit @objc public enum MediaMessageViewMode: UInt { diff --git a/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift b/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift index 66c03c8fe..54156723d 100644 --- a/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift +++ b/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift @@ -4,7 +4,7 @@ import Foundation import MediaPlayer -import SignalServiceKit +import SessionServiceKit // A modal view that be used during blocking interactions (e.g. waiting on response from // service or on the completion of a long-running local operation). diff --git a/SignalMessaging/ViewControllers/NewNonContactConversationViewController.m b/SignalMessaging/ViewControllers/NewNonContactConversationViewController.m index f6d458c75..06b980b21 100644 --- a/SignalMessaging/ViewControllers/NewNonContactConversationViewController.m +++ b/SignalMessaging/ViewControllers/NewNonContactConversationViewController.m @@ -6,7 +6,7 @@ #import "BlockListUIUtils.h" #import "ContactsViewHelper.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/ViewControllers/SelectRecipientViewController.m b/SignalMessaging/ViewControllers/SelectRecipientViewController.m index a5f087273..431b50d32 100644 --- a/SignalMessaging/ViewControllers/SelectRecipientViewController.m +++ b/SignalMessaging/ViewControllers/SelectRecipientViewController.m @@ -14,11 +14,11 @@ #import #import #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/ViewControllers/SelectThreadViewController.m b/SignalMessaging/ViewControllers/SelectThreadViewController.m index 9d563c219..403d5240a 100644 --- a/SignalMessaging/ViewControllers/SelectThreadViewController.m +++ b/SignalMessaging/ViewControllers/SelectThreadViewController.m @@ -16,12 +16,12 @@ #import "UIFont+OWS.h" #import "UIView+OWS.h" #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m index 3e724f558..e0645912a 100644 --- a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m +++ b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m @@ -10,10 +10,10 @@ #import "UIFont+OWS.h" #import "UIView+OWS.h" #import -#import -#import -#import -#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/ViewControllers/ViewControllerUtils.m b/SignalMessaging/ViewControllers/ViewControllerUtils.m index 96896f08a..f303c6fa0 100644 --- a/SignalMessaging/ViewControllers/ViewControllerUtils.m +++ b/SignalMessaging/ViewControllers/ViewControllerUtils.m @@ -6,8 +6,8 @@ #import "PhoneNumber.h" #import #import -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/ViewModels/OWSQuotedReplyModel.h b/SignalMessaging/ViewModels/OWSQuotedReplyModel.h index 471613b47..afdea45fe 100644 --- a/SignalMessaging/ViewModels/OWSQuotedReplyModel.h +++ b/SignalMessaging/ViewModels/OWSQuotedReplyModel.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/ViewModels/OWSQuotedReplyModel.m b/SignalMessaging/ViewModels/OWSQuotedReplyModel.m index 2ce5c8f4b..167a0a900 100644 --- a/SignalMessaging/ViewModels/OWSQuotedReplyModel.m +++ b/SignalMessaging/ViewModels/OWSQuotedReplyModel.m @@ -5,16 +5,16 @@ #import "OWSQuotedReplyModel.h" #import "ConversationViewItem.h" #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/Views/ContactCellView.m b/SignalMessaging/Views/ContactCellView.m index 61bd10717..9c06751d7 100644 --- a/SignalMessaging/Views/ContactCellView.m +++ b/SignalMessaging/Views/ContactCellView.m @@ -8,11 +8,11 @@ #import "UIFont+OWS.h" #import "UIView+OWS.h" #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/Views/ContactTableViewCell.m b/SignalMessaging/Views/ContactTableViewCell.m index 7b77cfccd..372d7fae8 100644 --- a/SignalMessaging/Views/ContactTableViewCell.m +++ b/SignalMessaging/Views/ContactTableViewCell.m @@ -8,7 +8,7 @@ #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/Views/ContactsViewHelper.m b/SignalMessaging/Views/ContactsViewHelper.m index 4181abb0b..93d9191a6 100644 --- a/SignalMessaging/Views/ContactsViewHelper.m +++ b/SignalMessaging/Views/ContactsViewHelper.m @@ -7,13 +7,13 @@ #import "UIUtil.h" #import #import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import @import ContactsUI; diff --git a/SignalMessaging/Views/OWSFlatButton.swift b/SignalMessaging/Views/OWSFlatButton.swift index 9214f27a0..5cb2ff2d5 100644 --- a/SignalMessaging/Views/OWSFlatButton.swift +++ b/SignalMessaging/Views/OWSFlatButton.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public class OWSFlatButton: UIView { diff --git a/SignalMessaging/Views/ThreadViewHelper.m b/SignalMessaging/Views/ThreadViewHelper.m index 289155f49..199d164fb 100644 --- a/SignalMessaging/Views/ThreadViewHelper.m +++ b/SignalMessaging/Views/ThreadViewHelper.m @@ -3,10 +3,10 @@ // #import "ThreadViewHelper.h" -#import -#import -#import -#import +#import +#import +#import +#import #import #import #import diff --git a/SignalMessaging/appearance/OWSConversationColor.h b/SignalMessaging/appearance/OWSConversationColor.h index 838366340..4ee2c6a08 100644 --- a/SignalMessaging/appearance/OWSConversationColor.h +++ b/SignalMessaging/appearance/OWSConversationColor.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/appearance/OWSConversationColor.m b/SignalMessaging/appearance/OWSConversationColor.m index 74365bed0..e1f3715af 100644 --- a/SignalMessaging/appearance/OWSConversationColor.m +++ b/SignalMessaging/appearance/OWSConversationColor.m @@ -5,7 +5,7 @@ #import "OWSConversationColor.h" #import "Theme.h" #import "UIColor+OWS.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/appearance/Theme.m b/SignalMessaging/appearance/Theme.m index 89922e092..cae2f7b9a 100644 --- a/SignalMessaging/appearance/Theme.m +++ b/SignalMessaging/appearance/Theme.m @@ -5,9 +5,9 @@ #import "Theme.h" #import "UIColor+OWS.h" #import "UIUtil.h" -#import -#import -#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/attachments/AttachmentSharing.m b/SignalMessaging/attachments/AttachmentSharing.m index 10c005a54..5403825d9 100644 --- a/SignalMessaging/attachments/AttachmentSharing.m +++ b/SignalMessaging/attachments/AttachmentSharing.m @@ -4,9 +4,9 @@ #import "AttachmentSharing.h" #import "UIUtil.h" -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/attachments/SignalAttachment.swift b/SignalMessaging/attachments/SignalAttachment.swift index e58b84847..1e7e3d61c 100644 --- a/SignalMessaging/attachments/SignalAttachment.swift +++ b/SignalMessaging/attachments/SignalAttachment.swift @@ -4,7 +4,7 @@ import Foundation import MobileCoreServices -import SignalServiceKit +import SessionServiceKit import PromiseKit import AVFoundation diff --git a/SignalMessaging/categories/NSAttributedString+OWS.m b/SignalMessaging/categories/NSAttributedString+OWS.m index 968b5136c..df3105d9b 100644 --- a/SignalMessaging/categories/NSAttributedString+OWS.m +++ b/SignalMessaging/categories/NSAttributedString+OWS.m @@ -4,7 +4,7 @@ #import "NSAttributedString+OWS.h" #import "UIView+OWS.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/categories/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m index da53d6d1b..5d126a00a 100644 --- a/SignalMessaging/categories/UIColor+OWS.m +++ b/SignalMessaging/categories/UIColor+OWS.m @@ -4,7 +4,7 @@ #import "UIColor+OWS.h" #import "OWSMath.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m index 14b80f75c..e62887483 100644 --- a/SignalMessaging/categories/UIFont+OWS.m +++ b/SignalMessaging/categories/UIFont+OWS.m @@ -3,7 +3,7 @@ // #import "UIFont+OWS.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/categories/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h index 64e24b4ce..b7f0cbf63 100644 --- a/SignalMessaging/categories/UIView+OWS.h +++ b/SignalMessaging/categories/UIView+OWS.h @@ -3,7 +3,7 @@ // #import -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m index 23263bd87..3b986233f 100644 --- a/SignalMessaging/categories/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -4,9 +4,9 @@ #import "UIView+OWS.h" #import "OWSMath.h" -#import +#import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/categories/UIViewController+OWS.m b/SignalMessaging/categories/UIViewController+OWS.m index 906d8f1c2..dbb0c759a 100644 --- a/SignalMessaging/categories/UIViewController+OWS.m +++ b/SignalMessaging/categories/UIViewController+OWS.m @@ -7,9 +7,9 @@ #import "UIUtil.h" #import "UIView+OWS.h" #import "UIViewController+OWS.h" -#import +#import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/contacts/OWSContactsManager.h b/SignalMessaging/contacts/OWSContactsManager.h index 7e8ba009c..ee5078e0f 100644 --- a/SignalMessaging/contacts/OWSContactsManager.h +++ b/SignalMessaging/contacts/OWSContactsManager.h @@ -2,8 +2,8 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/contacts/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m index dfcdf7481..15c17fb92 100644 --- a/SignalMessaging/contacts/OWSContactsManager.m +++ b/SignalMessaging/contacts/OWSContactsManager.m @@ -9,18 +9,18 @@ #import "OWSProfileManager.h" #import "OWSUserProfile.h" #import "ViewControllerUtils.h" -#import -#import +#import +#import #import #import #import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import @import Contacts; diff --git a/SignalMessaging/contacts/OWSSyncManager.h b/SignalMessaging/contacts/OWSSyncManager.h index 07ecad360..d5203b02f 100644 --- a/SignalMessaging/contacts/OWSSyncManager.h +++ b/SignalMessaging/contacts/OWSSyncManager.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/contacts/OWSSyncManager.m b/SignalMessaging/contacts/OWSSyncManager.m index 50954e223..3015aa711 100644 --- a/SignalMessaging/contacts/OWSSyncManager.m +++ b/SignalMessaging/contacts/OWSSyncManager.m @@ -9,22 +9,22 @@ #import "OWSProfileManager.h" #import "OWSReadReceiptManager.h" #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/contacts/SystemContactsFetcher.swift b/SignalMessaging/contacts/SystemContactsFetcher.swift index fe1525402..4056c0876 100644 --- a/SignalMessaging/contacts/SystemContactsFetcher.swift +++ b/SignalMessaging/contacts/SystemContactsFetcher.swift @@ -5,7 +5,7 @@ import Foundation import Contacts import ContactsUI -import SignalServiceKit +import SessionServiceKit enum Result { case success(T) diff --git a/SignalMessaging/environment/AppSetup.m b/SignalMessaging/environment/AppSetup.m index 946daef19..2e1f164e8 100644 --- a/SignalMessaging/environment/AppSetup.m +++ b/SignalMessaging/environment/AppSetup.m @@ -5,27 +5,27 @@ #import "AppSetup.h" #import "Environment.h" #import "VersionMigrations.h" -#import +#import #import #import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/environment/Environment.h b/SignalMessaging/environment/Environment.h index b1894bd26..f3e0454fc 100644 --- a/SignalMessaging/environment/Environment.h +++ b/SignalMessaging/environment/Environment.h @@ -2,7 +2,7 @@ // Copyright (c) 2019 Open Whisper Systems. All rights reserved. // -#import +#import @class OWSAudioSession; @class OWSContactsManager; diff --git a/SignalMessaging/environment/Environment.m b/SignalMessaging/environment/Environment.m index dd4b6f12a..6a074fd1d 100644 --- a/SignalMessaging/environment/Environment.m +++ b/SignalMessaging/environment/Environment.m @@ -4,8 +4,8 @@ #import "Environment.h" #import "OWSPreferences.h" -#import -#import +#import +#import static Environment *sharedEnvironment = nil; diff --git a/SignalMessaging/environment/NoopCallMessageHandler.swift b/SignalMessaging/environment/NoopCallMessageHandler.swift index 647b57768..fda57385a 100644 --- a/SignalMessaging/environment/NoopCallMessageHandler.swift +++ b/SignalMessaging/environment/NoopCallMessageHandler.swift @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -import SignalServiceKit +import SessionServiceKit @objc public class NoopCallMessageHandler: NSObject, OWSCallMessageHandler { diff --git a/SignalMessaging/environment/OWSSounds.m b/SignalMessaging/environment/OWSSounds.m index e03b2553f..fb9bb7594 100644 --- a/SignalMessaging/environment/OWSSounds.m +++ b/SignalMessaging/environment/OWSSounds.m @@ -6,10 +6,10 @@ #import "Environment.h" #import "OWSAudioPlayer.h" #import -#import -#import -#import -#import +#import +#import +#import +#import #import NSString *const kOWSSoundsStorageNotificationCollection = @"kOWSSoundsStorageNotificationCollection"; diff --git a/SignalMessaging/environment/SignalKeyingStorage.m b/SignalMessaging/environment/SignalKeyingStorage.m index b76cc9f5a..13989f4e1 100644 --- a/SignalMessaging/environment/SignalKeyingStorage.m +++ b/SignalMessaging/environment/SignalKeyingStorage.m @@ -3,9 +3,9 @@ // #import "SignalKeyingStorage.h" -#import -#import -#import +#import +#import +#import #define SignalKeyingCollection @"SignalKeyingCollection" diff --git a/SignalMessaging/environment/VersionMigrations.m b/SignalMessaging/environment/VersionMigrations.m index 13d8b07b9..d1f7412ba 100644 --- a/SignalMessaging/environment/VersionMigrations.m +++ b/SignalMessaging/environment/VersionMigrations.m @@ -7,15 +7,15 @@ #import "OWSDatabaseMigrationRunner.h" #import "SignalKeyingStorage.h" #import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/environment/migrations/OWS103EnableVideoCalling.m b/SignalMessaging/environment/migrations/OWS103EnableVideoCalling.m index 3b7451e7f..ac570e586 100644 --- a/SignalMessaging/environment/migrations/OWS103EnableVideoCalling.m +++ b/SignalMessaging/environment/migrations/OWS103EnableVideoCalling.m @@ -3,10 +3,10 @@ // #import "OWS103EnableVideoCalling.h" -#import -#import -#import -#import +#import +#import +#import +#import // Increment a similar constant for every future DBMigration static NSString *const OWS103EnableVideoCallingMigrationId = @"103"; diff --git a/SignalMessaging/environment/migrations/OWS104CreateRecipientIdentities.m b/SignalMessaging/environment/migrations/OWS104CreateRecipientIdentities.m index 5811b75a2..007687325 100644 --- a/SignalMessaging/environment/migrations/OWS104CreateRecipientIdentities.m +++ b/SignalMessaging/environment/migrations/OWS104CreateRecipientIdentities.m @@ -3,8 +3,8 @@ // #import "OWS104CreateRecipientIdentities.h" -#import -#import +#import +#import #import #import diff --git a/SignalMessaging/environment/migrations/OWS105AttachmentFilePaths.m b/SignalMessaging/environment/migrations/OWS105AttachmentFilePaths.m index 3ff8b6357..54d22e1bf 100644 --- a/SignalMessaging/environment/migrations/OWS105AttachmentFilePaths.m +++ b/SignalMessaging/environment/migrations/OWS105AttachmentFilePaths.m @@ -3,7 +3,7 @@ // #import "OWS105AttachmentFilePaths.h" -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift b/SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift index 686137426..cff73b023 100644 --- a/SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift +++ b/SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift @@ -4,7 +4,7 @@ import Foundation import PromiseKit -import SignalServiceKit +import SessionServiceKit @objc public class OWS106EnsureProfileComplete: OWSDatabaseMigration { diff --git a/SignalMessaging/environment/migrations/OWS109OutgoingMessageState.m b/SignalMessaging/environment/migrations/OWS109OutgoingMessageState.m index 3f407150d..602152ee3 100644 --- a/SignalMessaging/environment/migrations/OWS109OutgoingMessageState.m +++ b/SignalMessaging/environment/migrations/OWS109OutgoingMessageState.m @@ -3,8 +3,8 @@ // #import "OWS109OutgoingMessageState.h" -#import -#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/environment/migrations/OWS111UDAttributesMigration.swift b/SignalMessaging/environment/migrations/OWS111UDAttributesMigration.swift index 0e7d75cde..6556cfe6c 100644 --- a/SignalMessaging/environment/migrations/OWS111UDAttributesMigration.swift +++ b/SignalMessaging/environment/migrations/OWS111UDAttributesMigration.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public class OWS111UDAttributesMigration: OWSDatabaseMigration { diff --git a/SignalMessaging/environment/migrations/OWS112TypingIndicatorsMigration.swift b/SignalMessaging/environment/migrations/OWS112TypingIndicatorsMigration.swift index 5da442d3b..026a3d663 100644 --- a/SignalMessaging/environment/migrations/OWS112TypingIndicatorsMigration.swift +++ b/SignalMessaging/environment/migrations/OWS112TypingIndicatorsMigration.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public class OWS112TypingIndicatorsMigration: OWSDatabaseMigration { diff --git a/SignalMessaging/environment/migrations/OWS113MultiAttachmentMediaMessages.swift b/SignalMessaging/environment/migrations/OWS113MultiAttachmentMediaMessages.swift index 68919222b..6d6cc288b 100644 --- a/SignalMessaging/environment/migrations/OWS113MultiAttachmentMediaMessages.swift +++ b/SignalMessaging/environment/migrations/OWS113MultiAttachmentMediaMessages.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public class OWS113MultiAttachmentMediaMessages: OWSDatabaseMigration { diff --git a/SignalMessaging/environment/migrations/OWS114RemoveDynamicInteractions.swift b/SignalMessaging/environment/migrations/OWS114RemoveDynamicInteractions.swift index 857215bd8..e7b462fd7 100644 --- a/SignalMessaging/environment/migrations/OWS114RemoveDynamicInteractions.swift +++ b/SignalMessaging/environment/migrations/OWS114RemoveDynamicInteractions.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit @objc public class OWS114RemoveDynamicInteractions: OWSDatabaseMigration { diff --git a/SignalMessaging/environment/migrations/OWSDatabaseMigration.h b/SignalMessaging/environment/migrations/OWSDatabaseMigration.h index 487991ab7..9fcbcd185 100644 --- a/SignalMessaging/environment/migrations/OWSDatabaseMigration.h +++ b/SignalMessaging/environment/migrations/OWSDatabaseMigration.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/environment/migrations/OWSDatabaseMigration.m b/SignalMessaging/environment/migrations/OWSDatabaseMigration.m index 2f23a47f9..1ce139f3e 100644 --- a/SignalMessaging/environment/migrations/OWSDatabaseMigration.m +++ b/SignalMessaging/environment/migrations/OWSDatabaseMigration.m @@ -3,8 +3,8 @@ // #import "OWSDatabaseMigration.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m b/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m index dd63f6811..d6e920217 100644 --- a/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m +++ b/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m @@ -13,7 +13,7 @@ #import "OWS109OutgoingMessageState.h" #import "OWSDatabaseMigration.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/profiles/OWSProfileManager.h b/SignalMessaging/profiles/OWSProfileManager.h index 0dd3a97b9..7f3cf32e0 100644 --- a/SignalMessaging/profiles/OWSProfileManager.h +++ b/SignalMessaging/profiles/OWSProfileManager.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m index 1d23b102b..41e545a7d 100644 --- a/SignalMessaging/profiles/OWSProfileManager.m +++ b/SignalMessaging/profiles/OWSProfileManager.m @@ -6,31 +6,31 @@ #import "Environment.h" #import "OWSUserProfile.h" #import -#import -#import -#import +#import +#import +#import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/profiles/OWSUserProfile.h b/SignalMessaging/profiles/OWSUserProfile.h index 980602666..843b0c6e5 100644 --- a/SignalMessaging/profiles/OWSUserProfile.h +++ b/SignalMessaging/profiles/OWSUserProfile.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/profiles/OWSUserProfile.m b/SignalMessaging/profiles/OWSUserProfile.m index 0119159e0..e0b2503f9 100644 --- a/SignalMessaging/profiles/OWSUserProfile.m +++ b/SignalMessaging/profiles/OWSUserProfile.m @@ -4,16 +4,16 @@ #import "OWSUserProfile.h" #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import #import diff --git a/SignalMessaging/profiles/ProfileFetcherJob.swift b/SignalMessaging/profiles/ProfileFetcherJob.swift index 3d2e644d8..6d8f78b43 100644 --- a/SignalMessaging/profiles/ProfileFetcherJob.swift +++ b/SignalMessaging/profiles/ProfileFetcherJob.swift @@ -4,8 +4,8 @@ import Foundation import PromiseKit -import SignalServiceKit -import SignalMetadataKit +import SessionServiceKit +import SessionMetadataKit @objc public class ProfileFetcherJob: NSObject { diff --git a/SignalMessaging/utils/BlockListUIUtils.m b/SignalMessaging/utils/BlockListUIUtils.m index 8541fac45..db07e760f 100644 --- a/SignalMessaging/utils/BlockListUIUtils.m +++ b/SignalMessaging/utils/BlockListUIUtils.m @@ -6,11 +6,11 @@ #import "OWSContactsManager.h" #import "PhoneNumber.h" #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/utils/DebugLogger.m b/SignalMessaging/utils/DebugLogger.m index ce52a765b..a4ce5a61a 100644 --- a/SignalMessaging/utils/DebugLogger.m +++ b/SignalMessaging/utils/DebugLogger.m @@ -4,9 +4,9 @@ #import "DebugLogger.h" #import "OWSScrubbingLogFormatter.h" -#import -#import -#import +#import +#import +#import #pragma mark Logging - Production logging wants us to write some logs to a file in case we need it for debugging. #import diff --git a/SignalMessaging/utils/DeviceSleepManager.swift b/SignalMessaging/utils/DeviceSleepManager.swift index f26080344..5b3771c5d 100644 --- a/SignalMessaging/utils/DeviceSleepManager.swift +++ b/SignalMessaging/utils/DeviceSleepManager.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit // This entity has responsibility for blocking the device from sleeping if // certain behaviors (e.g. recording or playing voice messages) are in progress. diff --git a/SignalMessaging/utils/FullTextSearcher.swift b/SignalMessaging/utils/FullTextSearcher.swift index fa56f7ccb..8555e28f3 100644 --- a/SignalMessaging/utils/FullTextSearcher.swift +++ b/SignalMessaging/utils/FullTextSearcher.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalServiceKit +import SessionServiceKit public typealias MessageSortKey = UInt64 public struct ConversationSortKey: Comparable { diff --git a/SignalMessaging/utils/OWSAudioPlayer.m b/SignalMessaging/utils/OWSAudioPlayer.m index e44963ef4..3c099bea5 100644 --- a/SignalMessaging/utils/OWSAudioPlayer.m +++ b/SignalMessaging/utils/OWSAudioPlayer.m @@ -6,7 +6,7 @@ #import "TSAttachmentStream.h" #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/utils/OWSContactAvatarBuilder.h b/SignalMessaging/utils/OWSContactAvatarBuilder.h index ab2ace61b..0e896c41b 100644 --- a/SignalMessaging/utils/OWSContactAvatarBuilder.h +++ b/SignalMessaging/utils/OWSContactAvatarBuilder.h @@ -3,7 +3,7 @@ // #import "OWSAvatarBuilder.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/utils/OWSContactAvatarBuilder.m b/SignalMessaging/utils/OWSContactAvatarBuilder.m index eb6e9b43a..710aa23eb 100644 --- a/SignalMessaging/utils/OWSContactAvatarBuilder.m +++ b/SignalMessaging/utils/OWSContactAvatarBuilder.m @@ -10,7 +10,7 @@ #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/utils/OWSGroupAvatarBuilder.m b/SignalMessaging/utils/OWSGroupAvatarBuilder.m index 09c384894..22738e134 100644 --- a/SignalMessaging/utils/OWSGroupAvatarBuilder.m +++ b/SignalMessaging/utils/OWSGroupAvatarBuilder.m @@ -7,8 +7,8 @@ #import "TSGroupThread.h" #import "UIColor+OWS.h" #import -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/utils/OWSPreferences.m b/SignalMessaging/utils/OWSPreferences.m index b10238e2e..32753f223 100644 --- a/SignalMessaging/utils/OWSPreferences.m +++ b/SignalMessaging/utils/OWSPreferences.m @@ -3,14 +3,14 @@ // #import "OWSPreferences.h" -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index 33b3795c5..b5fed85ea 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -8,24 +8,24 @@ #import "OWSQuotedReplyModel.h" #import "OWSUnreadIndicator.h" #import "TSUnreadIndicatorInteraction.h" -#import -#import +#import +#import #import #import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalMessaging/utils/UIUtil.h b/SignalMessaging/utils/UIUtil.h index f5f17972e..dc61e8a0a 100644 --- a/SignalMessaging/utils/UIUtil.h +++ b/SignalMessaging/utils/UIUtil.h @@ -4,8 +4,8 @@ #import "UIColor+OWS.h" #import "UIFont+OWS.h" -#import -#import +#import +#import #define ACCESSIBILITY_IDENTIFIER_WITH_NAME(_root_view, _variable_name) \ ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) diff --git a/SignalMessaging/utils/UIUtil.m b/SignalMessaging/utils/UIUtil.m index f06c983ce..ff1054bd9 100644 --- a/SignalMessaging/utils/UIUtil.m +++ b/SignalMessaging/utils/UIUtil.m @@ -5,7 +5,7 @@ #import "UIUtil.h" #import "Theme.h" #import "UIColor+OWS.h" -#import +#import #import #define CONTACT_PICTURE_VIEW_BORDER_WIDTH 0.5f diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m index 4c9029336..59d6f8900 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.m +++ b/SignalServiceKit/src/Account/TSAccountManager.m @@ -18,9 +18,9 @@ #import "YapDatabaseTransaction+OWS.h" #import #import -#import -#import -#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Account/TSPreKeyManager.m b/SignalServiceKit/src/Account/TSPreKeyManager.m index 332923422..22c24e0dc 100644 --- a/SignalServiceKit/src/Account/TSPreKeyManager.m +++ b/SignalServiceKit/src/Account/TSPreKeyManager.m @@ -10,8 +10,8 @@ #import "SSKEnvironment.h" #import "TSNetworkManager.h" #import "TSStorageHeaders.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Contacts/CDSSigningCertificate.m b/SignalServiceKit/src/Contacts/CDSSigningCertificate.m index 0b680da46..6628b4d1d 100644 --- a/SignalServiceKit/src/Contacts/CDSSigningCertificate.m +++ b/SignalServiceKit/src/Contacts/CDSSigningCertificate.m @@ -4,8 +4,8 @@ #import "CDSSigningCertificate.h" #import -#import -#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Contacts/Contact.m b/SignalServiceKit/src/Contacts/Contact.m index 74d708798..b7f17f64a 100644 --- a/SignalServiceKit/src/Contacts/Contact.m +++ b/SignalServiceKit/src/Contacts/Contact.m @@ -8,8 +8,8 @@ #import "SSKEnvironment.h" #import "SignalRecipient.h" #import "TSAccountManager.h" -#import -#import +#import +#import @import Contacts; diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m index 0b0bcfb5e..293e75593 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m @@ -10,11 +10,11 @@ #import "OWSRequestFactory.h" #import "SSKEnvironment.h" #import "TSNetworkManager.h" -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Contacts/ContactsUpdater.m b/SignalServiceKit/src/Contacts/ContactsUpdater.m index 287483558..1deef0b37 100644 --- a/SignalServiceKit/src/Contacts/ContactsUpdater.m +++ b/SignalServiceKit/src/Contacts/ContactsUpdater.m @@ -9,9 +9,9 @@ #import "PhoneNumber.h" #import "SSKEnvironment.h" #import "TSNetworkManager.h" -#import -#import -#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m index 6361cf844..95072d9d9 100644 --- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m +++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m @@ -4,7 +4,7 @@ #import "OWSDisappearingMessagesConfiguration.h" #import "NSString+SSK.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Contacts/SignalRecipient.m b/SignalServiceKit/src/Contacts/SignalRecipient.m index 6f2c576c0..3be03c964 100644 --- a/SignalServiceKit/src/Contacts/SignalRecipient.m +++ b/SignalServiceKit/src/Contacts/SignalRecipient.m @@ -8,7 +8,7 @@ #import "SSKEnvironment.h" #import "TSAccountManager.h" #import "TSSocketManager.h" -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Contacts/TSThread.m b/SignalServiceKit/src/Contacts/TSThread.m index 8ec851b3d..b853fb621 100644 --- a/SignalServiceKit/src/Contacts/TSThread.m +++ b/SignalServiceKit/src/Contacts/TSThread.m @@ -15,9 +15,9 @@ #import "TSInteraction.h" #import "TSInvalidIdentityKeyReceivingErrorMessage.h" #import "TSOutgoingMessage.h" -#import -#import -#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Contacts/Threads/TSContactThread.m b/SignalServiceKit/src/Contacts/Threads/TSContactThread.m index 54cdef3ee..037eb9975 100644 --- a/SignalServiceKit/src/Contacts/Threads/TSContactThread.m +++ b/SignalServiceKit/src/Contacts/Threads/TSContactThread.m @@ -8,10 +8,10 @@ #import "NotificationsProtocol.h" #import "OWSIdentityManager.h" #import "SSKEnvironment.h" -#import +#import #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m index 05c7864b3..dc0f066e3 100644 --- a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m +++ b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m @@ -4,11 +4,11 @@ #import "TSGroupThread.h" #import "TSAttachmentStream.h" -#import -#import +#import +#import #import #import -#import +#import #import "OWSPrimaryStorage.h" NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m index ee29fa70d..7132eb3df 100644 --- a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m +++ b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m @@ -3,7 +3,7 @@ // #import "OWSBlockedPhoneNumbersMessage.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m b/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m index f50efc73a..c9c335654 100644 --- a/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m @@ -3,7 +3,7 @@ // #import "OWSChunkedOutputStream.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m index 82889da4f..7553717af 100644 --- a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m @@ -12,9 +12,9 @@ #import "OWSRecipientIdentity.h" #import "SignalAccount.h" #import "TSContactThread.h" -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSDevice.m b/SignalServiceKit/src/Devices/OWSDevice.m index 54f6ad2cd..0c368527a 100644 --- a/SignalServiceKit/src/Devices/OWSDevice.m +++ b/SignalServiceKit/src/Devices/OWSDevice.m @@ -12,9 +12,9 @@ #import "YapDatabaseConnection.h" #import "YapDatabaseTransaction.h" #import -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m index 89ce9e763..2d2890f70 100644 --- a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m @@ -8,7 +8,7 @@ #import "OWSDisappearingMessagesConfiguration.h" #import "TSGroupModel.h" #import "TSGroupThread.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSProvisioningCipher.m b/SignalServiceKit/src/Devices/OWSProvisioningCipher.m index aac5b6499..3742158c3 100644 --- a/SignalServiceKit/src/Devices/OWSProvisioningCipher.m +++ b/SignalServiceKit/src/Devices/OWSProvisioningCipher.m @@ -4,9 +4,9 @@ #import "OWSProvisioningCipher.h" #import -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSProvisioningMessage.m b/SignalServiceKit/src/Devices/OWSProvisioningMessage.m index 14073e1de..3f4dc0188 100644 --- a/SignalServiceKit/src/Devices/OWSProvisioningMessage.m +++ b/SignalServiceKit/src/Devices/OWSProvisioningMessage.m @@ -4,10 +4,10 @@ #import "OWSProvisioningMessage.h" #import "OWSProvisioningCipher.h" -#import -#import -#import -#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m index 92f7c5ca7..1b9a17eeb 100644 --- a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m +++ b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m @@ -4,7 +4,7 @@ #import "OWSReadReceiptsForLinkedDevicesMessage.h" #import "OWSLinkedDeviceReadReceipt.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m b/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m index 581f6ee45..ca31032df 100644 --- a/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m +++ b/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m @@ -4,8 +4,8 @@ #import "OWSReceiptsForSenderMessage.h" #import "SignalRecipient.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m index 96c5e4a76..1ae8d24d0 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m @@ -16,7 +16,7 @@ #import "TSOutgoingMessage.h" #import "TSQuotedMessage.h" #import "TSThread.h" -#import +#import #import "OWSPrimaryStorage+Loki.h" NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m index e9f7e0080..8bdf108bd 100644 --- a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m +++ b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m @@ -4,8 +4,8 @@ #import "OWSVerificationStateSyncMessage.h" #import "OWSIdentityManager.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Loki/API/LokiDotNetAPI.swift b/SignalServiceKit/src/Loki/API/LokiDotNetAPI.swift index 48bcf9854..46b72c26b 100644 --- a/SignalServiceKit/src/Loki/API/LokiDotNetAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiDotNetAPI.swift @@ -1,5 +1,5 @@ import PromiseKit -import SignalMetadataKit +import SessionMetadataKit /// Base class for `LokiFileServerAPI` and `LokiPublicChatAPI`. public class LokiDotNetAPI : NSObject { diff --git a/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift b/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift index 9d062f121..9588ecabf 100644 --- a/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift +++ b/SignalServiceKit/src/Loki/API/LokiFileServerProxy.swift @@ -1,5 +1,5 @@ import PromiseKit -import SignalMetadataKit +import SessionMetadataKit internal class LokiFileServerProxy : LokiHTTPClient { private let server: String diff --git a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h index 155a60524..baef19e0a 100644 --- a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h +++ b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h @@ -1,9 +1,9 @@ #import "OWSPrimaryStorage.h" -#import -#import -#import -#import +#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m index 5ed6a2318..da060fe53 100644 --- a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m +++ b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m @@ -9,9 +9,9 @@ #import "TSPreKeyManager.h" #import "YapDatabaseConnection+OWS.h" #import "YapDatabaseTransaction+OWS.h" -#import +#import #import "NSObject+Casting.h" -#import +#import @implementation OWSPrimaryStorage (Loki) diff --git a/SignalServiceKit/src/Loki/Protocol/Closed Groups/LKSessionRequestMessage.m b/SignalServiceKit/src/Loki/Protocol/Closed Groups/LKSessionRequestMessage.m index 4e4724506..ba2604625 100644 --- a/SignalServiceKit/src/Loki/Protocol/Closed Groups/LKSessionRequestMessage.m +++ b/SignalServiceKit/src/Loki/Protocol/Closed Groups/LKSessionRequestMessage.m @@ -1,6 +1,6 @@ #import "LKSessionRequestMessage.h" -#import -#import +#import +#import @implementation LKSessionRequestMessage diff --git a/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.m b/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.m index c1be09c3f..43107aed6 100644 --- a/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.m +++ b/SignalServiceKit/src/Loki/Protocol/Friend Requests/LKFriendRequestMessage.m @@ -5,7 +5,7 @@ #import "SSKEnvironment.h" #import "TSThread.h" -#import +#import @implementation LKFriendRequestMessage diff --git a/SignalServiceKit/src/Loki/Protocol/Meta/LKAddressMessage.m b/SignalServiceKit/src/Loki/Protocol/Meta/LKAddressMessage.m index 47bcdaafc..276406c5a 100644 --- a/SignalServiceKit/src/Loki/Protocol/Meta/LKAddressMessage.m +++ b/SignalServiceKit/src/Loki/Protocol/Meta/LKAddressMessage.m @@ -1,7 +1,7 @@ #import "LKAddressMessage.h" #import "NSDate+OWS.h" #import "SignalRecipient.h" -#import +#import @interface LKAddressMessage () diff --git a/SignalServiceKit/src/Loki/Protocol/Meta/LKEphemeralMessage.m b/SignalServiceKit/src/Loki/Protocol/Meta/LKEphemeralMessage.m index fd2a358c7..0da18c769 100644 --- a/SignalServiceKit/src/Loki/Protocol/Meta/LKEphemeralMessage.m +++ b/SignalServiceKit/src/Loki/Protocol/Meta/LKEphemeralMessage.m @@ -1,6 +1,6 @@ #import "LKEphemeralMessage.h" -#import -#import +#import +#import @implementation LKEphemeralMessage diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/DeviceLinkingSession.swift b/SignalServiceKit/src/Loki/Protocol/Multi Device/DeviceLinkingSession.swift index 35c736c1e..851077938 100644 --- a/SignalServiceKit/src/Loki/Protocol/Multi Device/DeviceLinkingSession.swift +++ b/SignalServiceKit/src/Loki/Protocol/Multi Device/DeviceLinkingSession.swift @@ -1,4 +1,4 @@ -import Curve25519Kit +import SessionCurve25519Kit import PromiseKit @objc (LKDeviceLinkingSession) diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/LKDeviceLinkMessage.m b/SignalServiceKit/src/Loki/Protocol/Multi Device/LKDeviceLinkMessage.m index 5873a3bd0..abcf5a259 100644 --- a/SignalServiceKit/src/Loki/Protocol/Multi Device/LKDeviceLinkMessage.m +++ b/SignalServiceKit/src/Loki/Protocol/Multi Device/LKDeviceLinkMessage.m @@ -5,9 +5,9 @@ #import "ProtoUtils.h" #import "SSKEnvironment.h" #import "SignalRecipient.h" -#import -#import -#import +#import +#import +#import @implementation LKDeviceLinkMessage diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/LKUnlinkDeviceMessage.m b/SignalServiceKit/src/Loki/Protocol/Multi Device/LKUnlinkDeviceMessage.m index 04b519586..e29000d6a 100644 --- a/SignalServiceKit/src/Loki/Protocol/Multi Device/LKUnlinkDeviceMessage.m +++ b/SignalServiceKit/src/Loki/Protocol/Multi Device/LKUnlinkDeviceMessage.m @@ -1,6 +1,6 @@ #import "LKUnlinkDeviceMessage.h" -#import -#import +#import +#import @implementation LKUnlinkDeviceMessage diff --git a/SignalServiceKit/src/Loki/Protocol/Session Management/LKSessionRestoreMessage.m b/SignalServiceKit/src/Loki/Protocol/Session Management/LKSessionRestoreMessage.m index b6c5eeaab..6184491af 100644 --- a/SignalServiceKit/src/Loki/Protocol/Session Management/LKSessionRestoreMessage.m +++ b/SignalServiceKit/src/Loki/Protocol/Session Management/LKSessionRestoreMessage.m @@ -1,6 +1,6 @@ #import "LKSessionRestoreMessage.h" -#import -#import +#import +#import @implementation LKSessionRestoreMessage diff --git a/SignalServiceKit/src/Loki/Protocol/Session Management/LokiSessionResetImplementation.swift b/SignalServiceKit/src/Loki/Protocol/Session Management/LokiSessionResetImplementation.swift index d9a6b0d48..acf6833b6 100644 --- a/SignalServiceKit/src/Loki/Protocol/Session Management/LokiSessionResetImplementation.swift +++ b/SignalServiceKit/src/Loki/Protocol/Session Management/LokiSessionResetImplementation.swift @@ -1,5 +1,5 @@ import Foundation -import SignalMetadataKit +import SessionMetadataKit @objc(LKSessionResetImplementation) public class LokiSessionResetImplementation : NSObject, SessionResetProtocol { diff --git a/SignalServiceKit/src/Loki/Protocol/Sync Messages/LKSyncOpenGroupsMessage.m b/SignalServiceKit/src/Loki/Protocol/Sync Messages/LKSyncOpenGroupsMessage.m index 547564653..dc1d51037 100644 --- a/SignalServiceKit/src/Loki/Protocol/Sync Messages/LKSyncOpenGroupsMessage.m +++ b/SignalServiceKit/src/Loki/Protocol/Sync Messages/LKSyncOpenGroupsMessage.m @@ -1,6 +1,6 @@ #import "LKSyncOpenGroupsMessage.h" #import "OWSPrimaryStorage.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m index 076de2151..5f3118cf3 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m +++ b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m @@ -22,8 +22,8 @@ #import "TSNetworkManager.h" #import "TSThread.h" #import -#import -#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m index 6ca417e28..999f0a718 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m @@ -7,7 +7,7 @@ #import "NSString+SSK.h" #import "TSAttachmentPointer.h" #import "TSMessage.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m index 196d73810..bdb8004f1 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m @@ -5,8 +5,8 @@ #import "TSAttachmentPointer.h" #import "OWSBackupFragment.h" #import "TSAttachmentStream.h" -#import -#import +#import +#import #import #import diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m index f27a2ff7e..10566f8c3 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m @@ -8,8 +8,8 @@ #import "OWSFileSystem.h" #import "TSAttachmentPointer.h" #import -#import -#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m index 994c1af86..8c1d328a4 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m @@ -12,7 +12,7 @@ #import "TSOutgoingMessage.h" #import "TSQuotedMessage.h" #import "TSThread.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m index 56ffad853..6a6034734 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m @@ -5,7 +5,7 @@ #import "OWSOutgoingSentMessageTranscript.h" #import "TSOutgoingMessage.h" #import "TSThread.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m index 8bc0db631..5bb5fb55d 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m @@ -4,9 +4,9 @@ #import "OWSOutgoingSyncMessage.h" #import "ProtoUtils.h" -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m index f830ab201..51efe0c9a 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m @@ -3,7 +3,7 @@ // #import "OWSSyncConfigurationMessage.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m index 2e67f3996..995e54bc8 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m @@ -15,8 +15,8 @@ #import "TSAttachment.h" #import "TSAttachmentStream.h" #import "TSContactThread.h" -#import -#import +#import +#import #import "OWSPrimaryStorage.h" @import Contacts; diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m index de6f8022a..b96ab6486 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m @@ -9,8 +9,8 @@ #import "TSContactThread.h" #import "TSGroupModel.h" #import "TSGroupThread.h" -#import -#import +#import +#import #import "OWSPrimaryStorage.h" NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m index 26c333d21..3859e5560 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m @@ -3,8 +3,8 @@ // #import "OWSSyncGroupsRequestMessage.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact.h b/SignalServiceKit/src/Messages/Interactions/OWSContact.h index 3702cf4df..dc878044f 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSContact.h +++ b/SignalServiceKit/src/Messages/Interactions/OWSContact.h @@ -3,7 +3,7 @@ // #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact.m b/SignalServiceKit/src/Messages/Interactions/OWSContact.m index cd70e180c..65e0c42e8 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSContact.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSContact.m @@ -11,7 +11,7 @@ #import "TSAttachment.h" #import "TSAttachmentPointer.h" #import "TSAttachmentStream.h" -#import +#import #import @import Contacts; diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m index 6248a06c6..ea2438303 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m @@ -4,8 +4,8 @@ #import "OWSDisappearingMessagesConfigurationMessage.h" #import "OWSDisappearingMessagesConfiguration.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m index bf1f1870c..e231489e5 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m @@ -3,8 +3,8 @@ // #import "OWSDynamicOutgoingMessage.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m index d03ad04d6..856fc0710 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m @@ -5,7 +5,7 @@ #import "OWSEndSessionMessage.h" #import "OWSPrimaryStorage+Loki.h" #import "SignalRecipient.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m index 72f0064a5..a5dc9c703 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m @@ -8,8 +8,8 @@ #import "SSKEnvironment.h" #import "TSContactThread.h" #import "TSErrorMessage_privateConstructor.h" -#import -#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m index 7e01e11e7..9fcd887f9 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m @@ -11,7 +11,7 @@ #import "TSContactThread.h" #import "TSDatabaseSecondaryIndexes.h" #import "TSGroupThread.h" -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m index 483b44529..c1facd05b 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m @@ -5,7 +5,7 @@ #import "TSInfoMessage.h" #import "ContactsManagerProtocol.h" #import "SSKEnvironment.h" -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m index f09360281..025d10f70 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m +++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m @@ -5,8 +5,8 @@ #import "TSInteraction.h" #import "TSDatabaseSecondaryIndexes.h" #import "TSThread.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m index ced929af4..9b25ce135 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m @@ -12,8 +12,8 @@ #import "TSAttachmentStream.h" #import "TSQuotedMessage.h" #import "TSThread.h" -#import -#import +#import +#import #import #import #import "OWSPrimaryStorage+Loki.h" diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 8b2b148c5..4063b11c7 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -19,8 +19,8 @@ #import "TSContactThread.h" #import "TSGroupThread.h" #import "TSQuotedMessage.h" -#import -#import +#import +#import #import #import diff --git a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h index ba9445938..cdedc4f90 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h @@ -3,7 +3,7 @@ // #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m index bf7cd1349..0ece1fe2a 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m @@ -11,7 +11,7 @@ #import "TSInteraction.h" #import "TSOutgoingMessage.h" #import "TSThread.h" -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m index 07571df55..788925497 100644 --- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m +++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m @@ -13,9 +13,9 @@ #import "TSContactThread.h" #import "TSDatabaseView.h" #import "TSErrorMessage_privateConstructor.h" -#import -#import -#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m index b15c582ee..cbb522ef9 100644 --- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m +++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m @@ -11,7 +11,7 @@ #import "TSContactThread.h" #import "TSErrorMessage_privateConstructor.h" #import "TSOutgoingMessage.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m b/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m index 117d2fdc9..3af0c4d0d 100644 --- a/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m +++ b/SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m @@ -18,8 +18,8 @@ #import "TSDatabaseView.h" #import "TSErrorMessage.h" #import "TSYapDatabaseObject.h" -#import -#import +#import +#import #import #import #import diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m index 48103ce88..acc2bad88 100644 --- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m +++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m @@ -8,7 +8,7 @@ #import "TSMessage.h" #import "TSOutgoingMessage.h" #import "TSThread.h" -#import +#import #import #import #import diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m index 05d977166..3a6e6da19 100644 --- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m +++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m @@ -16,7 +16,7 @@ #import "TSIncomingMessage.h" #import "TSMessage.h" #import "TSThread.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.h b/SignalServiceKit/src/Messages/OWSIdentityManager.h index 58eccd90b..4eb13b210 100644 --- a/SignalServiceKit/src/Messages/OWSIdentityManager.h +++ b/SignalServiceKit/src/Messages/OWSIdentityManager.h @@ -3,7 +3,7 @@ // #import "OWSRecipientIdentity.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.m b/SignalServiceKit/src/Messages/OWSIdentityManager.m index d69b77e4f..35428aea7 100644 --- a/SignalServiceKit/src/Messages/OWSIdentityManager.m +++ b/SignalServiceKit/src/Messages/OWSIdentityManager.m @@ -23,10 +23,10 @@ #import "TSGroupThread.h" #import "YapDatabaseConnection+OWS.h" #import "YapDatabaseTransaction+OWS.h" -#import -#import -#import -#import +#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m b/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m index 18414a58f..7fbde2a85 100644 --- a/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m +++ b/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m @@ -6,7 +6,7 @@ #import "AppContext.h" #import "OWSPrimaryStorage.h" #import "TSCall.h" -#import +#import #import #import #import diff --git a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m index dbaf009cf..5aac34d32 100644 --- a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m +++ b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m @@ -21,14 +21,14 @@ #import "TSContactThread.h" #import "TSErrorMessage.h" #import "TSPreKeyManager.h" -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSMessageHandler.m b/SignalServiceKit/src/Messages/OWSMessageHandler.m index 6a36a344c..4c0028a80 100644 --- a/SignalServiceKit/src/Messages/OWSMessageHandler.m +++ b/SignalServiceKit/src/Messages/OWSMessageHandler.m @@ -3,7 +3,7 @@ // #import "OWSMessageHandler.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 38b50102d..d2592467f 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -50,12 +50,12 @@ #import "TSNetworkManager.h" #import "TSOutgoingMessage.h" #import "TSQuotedMessage.h" -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import #import #import "OWSDispatch.h" #import "OWSBatchMessageProcessor.h" diff --git a/SignalServiceKit/src/Messages/OWSMessageReceiver.m b/SignalServiceKit/src/Messages/OWSMessageReceiver.m index f53ebb573..f4ddc5dcc 100644 --- a/SignalServiceKit/src/Messages/OWSMessageReceiver.m +++ b/SignalServiceKit/src/Messages/OWSMessageReceiver.m @@ -19,14 +19,14 @@ #import "TSDatabaseView.h" #import "TSErrorMessage.h" #import "TSYapDatabaseObject.h" -#import -#import +#import +#import #import #import #import #import -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSMessageSend.swift b/SignalServiceKit/src/Messages/OWSMessageSend.swift index b9d186947..b9324851f 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSend.swift +++ b/SignalServiceKit/src/Messages/OWSMessageSend.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalMetadataKit +import SessionMetadataKit // Corresponds to a single effort to send a message to a given recipient, // which may span multiple attempts. Note that group messages may be sent diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 2bcc5e3a9..64eb481c1 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -50,19 +50,19 @@ #import "LKDeviceLinkMessage.h" #import "LKUnlinkDeviceMessage.h" #import "LKAddressMessage.h" -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import #import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSMessageServiceParams.m b/SignalServiceKit/src/Messages/OWSMessageServiceParams.m index d7a0cbf12..69b896bef 100644 --- a/SignalServiceKit/src/Messages/OWSMessageServiceParams.m +++ b/SignalServiceKit/src/Messages/OWSMessageServiceParams.m @@ -4,7 +4,7 @@ #import "OWSMessageServiceParams.h" #import "TSConstants.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m index cf4a36f10..975b280cf 100644 --- a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m +++ b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m @@ -6,8 +6,8 @@ #import "ProtoUtils.h" #import "SignalRecipient.h" #import "TSContactThread.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m index b84ec97cc..cfb4c58cf 100644 --- a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m +++ b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m @@ -5,9 +5,9 @@ #import "OWSOutgoingNullMessage.h" #import "OWSVerificationStateSyncMessage.h" #import "TSContactThread.h" -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.m b/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.m index da6a9e0de..3f8b705d6 100644 --- a/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.m +++ b/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.m @@ -12,7 +12,7 @@ #import "TSContactThread.h" #import "TSYapDatabaseObject.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m index 6a3936e36..e402090ba 100644 --- a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m +++ b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m @@ -6,7 +6,7 @@ #import "ProfileManagerProtocol.h" #import "ProtoUtils.h" #import "SSKEnvironment.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m index 0ec358668..237c8f450 100644 --- a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m +++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m @@ -17,9 +17,9 @@ #import "TSDatabaseView.h" #import "TSIncomingMessage.h" #import "YapDatabaseConnection+OWS.h" -#import -#import -#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h index 9e3b5fc89..ea16793fc 100644 --- a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h +++ b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h @@ -2,7 +2,7 @@ // Copyright (c) 2017 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m index 8e0df983b..51685ada1 100644 --- a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m +++ b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m @@ -3,7 +3,7 @@ // #import "PreKeyBundle+jsonDict.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/TSGroupModel.m b/SignalServiceKit/src/Messages/TSGroupModel.m index 4815594be..802526b3e 100644 --- a/SignalServiceKit/src/Messages/TSGroupModel.m +++ b/SignalServiceKit/src/Messages/TSGroupModel.m @@ -5,7 +5,7 @@ #import "TSGroupModel.h" #import "FunctionalUtil.h" #import "NSString+SSK.h" -#import +#import #import "OWSIdentityManager.h" NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift b/SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift index b8f7ad63b..bcb7d9364 100644 --- a/SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift +++ b/SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift @@ -4,7 +4,7 @@ import Foundation import PromiseKit -import SignalMetadataKit +import SessionMetadataKit @objc public enum RequestMakerUDAuthError: Int, Error { diff --git a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift b/SignalServiceKit/src/Messages/UD/OWSUDManager.swift index 8649decc5..9285fb0b4 100644 --- a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift +++ b/SignalServiceKit/src/Messages/UD/OWSUDManager.swift @@ -4,8 +4,8 @@ import Foundation import PromiseKit -import SignalMetadataKit -import SignalCoreKit +import SessionMetadataKit +import SessionCoreKit public enum OWSUDError: Error { case assertionError(description: String) diff --git a/SignalServiceKit/src/Network/API/OWSRequestBuilder.m b/SignalServiceKit/src/Network/API/OWSRequestBuilder.m index 31dca1149..9adf4057c 100644 --- a/SignalServiceKit/src/Network/API/OWSRequestBuilder.m +++ b/SignalServiceKit/src/Network/API/OWSRequestBuilder.m @@ -5,7 +5,7 @@ #import "OWSRequestBuilder.h" #import "TSConstants.h" #import "TSRequest.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Network/API/OWSUploadOperation.m b/SignalServiceKit/src/Network/API/OWSUploadOperation.m index 0077f00fc..eb921155c 100644 --- a/SignalServiceKit/src/Network/API/OWSUploadOperation.m +++ b/SignalServiceKit/src/Network/API/OWSUploadOperation.m @@ -13,9 +13,9 @@ #import "SSKEnvironment.h" #import "TSAttachmentStream.h" #import "TSNetworkManager.h" -#import +#import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index a07a7373e..628eab2f4 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -10,13 +10,13 @@ #import "TSAccountManager.h" #import "TSConstants.h" #import "TSRequest.h" -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Network/API/Requests/TSRequest.m b/SignalServiceKit/src/Network/API/Requests/TSRequest.m index c36c861da..276b82b01 100644 --- a/SignalServiceKit/src/Network/API/Requests/TSRequest.m +++ b/SignalServiceKit/src/Network/API/Requests/TSRequest.m @@ -5,8 +5,8 @@ #import "TSRequest.h" #import "TSAccountManager.h" #import "TSConstants.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Network/API/TSNetworkManager.m b/SignalServiceKit/src/Network/API/TSNetworkManager.m index fb7e50658..67e914b72 100644 --- a/SignalServiceKit/src/Network/API/TSNetworkManager.m +++ b/SignalServiceKit/src/Network/API/TSNetworkManager.m @@ -13,8 +13,8 @@ #import "TSAccountManager.h" #import "TSRequest.h" #import -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Network/ContentProxy.swift b/SignalServiceKit/src/Network/ContentProxy.swift index 29693e402..956e0f349 100644 --- a/SignalServiceKit/src/Network/ContentProxy.swift +++ b/SignalServiceKit/src/Network/ContentProxy.swift @@ -3,7 +3,7 @@ // import Foundation -import SignalCoreKit +import SessionCoreKit @objc public class ContentProxy: NSObject { diff --git a/SignalServiceKit/src/Network/SignalServiceClient.swift b/SignalServiceKit/src/Network/SignalServiceClient.swift index 21e2516d9..39bc8ba82 100644 --- a/SignalServiceKit/src/Network/SignalServiceClient.swift +++ b/SignalServiceKit/src/Network/SignalServiceClient.swift @@ -4,7 +4,7 @@ import Foundation import PromiseKit -import SignalMetadataKit +import SessionMetadataKit public typealias RecipientIdentifier = String diff --git a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m index 18a434808..f135c93d1 100644 --- a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m +++ b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m @@ -20,9 +20,9 @@ #import "TSConstants.h" #import "TSErrorMessage.h" #import "TSRequest.h" -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Protocols/ProtoUtils.m b/SignalServiceKit/src/Protocols/ProtoUtils.m index 853e1ef1c..45d5ad245 100644 --- a/SignalServiceKit/src/Protocols/ProtoUtils.m +++ b/SignalServiceKit/src/Protocols/ProtoUtils.m @@ -6,8 +6,8 @@ #import "ProfileManagerProtocol.h" #import "SSKEnvironment.h" #import "TSThread.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Security/OWSFingerprint.m b/SignalServiceKit/src/Security/OWSFingerprint.m index 14bac5b69..5c50fe2d5 100644 --- a/SignalServiceKit/src/Security/OWSFingerprint.m +++ b/SignalServiceKit/src/Security/OWSFingerprint.m @@ -4,10 +4,10 @@ #import "OWSFingerprint.h" #import "OWSError.h" -#import +#import #import -#import -#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Security/OWSFingerprintBuilder.m b/SignalServiceKit/src/Security/OWSFingerprintBuilder.m index e9fb87947..8ad4f31c4 100644 --- a/SignalServiceKit/src/Security/OWSFingerprintBuilder.m +++ b/SignalServiceKit/src/Security/OWSFingerprintBuilder.m @@ -7,7 +7,7 @@ #import "OWSFingerprint.h" #import "OWSIdentityManager.h" #import "TSAccountManager.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Security/OWSRecipientIdentity.m b/SignalServiceKit/src/Security/OWSRecipientIdentity.m index 620de3c4a..fb9b8d380 100644 --- a/SignalServiceKit/src/Security/OWSRecipientIdentity.m +++ b/SignalServiceKit/src/Security/OWSRecipientIdentity.m @@ -6,8 +6,8 @@ #import "OWSIdentityManager.h" #import "OWSPrimaryStorage+SessionStore.h" #import "OWSPrimaryStorage.h" -#import -#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/SignalServiceKit.h b/SignalServiceKit/src/SignalServiceKit.h index 3c49b5c7e..51c23a2cf 100644 --- a/SignalServiceKit/src/SignalServiceKit.h +++ b/SignalServiceKit/src/SignalServiceKit.h @@ -4,12 +4,12 @@ // Anything used by Swift outside of the framework must be imported. #import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.h b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.h index 508daff95..d076d0f9f 100644 --- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.h +++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.h @@ -3,7 +3,7 @@ // #import "OWSPrimaryStorage.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m index 8e5184917..70e92b2a3 100644 --- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m +++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m @@ -6,9 +6,9 @@ #import "OWSPrimaryStorage+keyFromIntLong.h" #import "TSStorageKeys.h" #import "YapDatabaseConnection+OWS.h" -#import -#import -#import +#import +#import +#import #define OWSPrimaryStoragePreKeyStoreCollection @"TSStorageManagerPreKeyStoreCollection" #define TSNextPrekeyIdKey @"TSStorageInternalSettingsNextPreKeyId" diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.h b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.h index 76f9d0479..db6007207 100644 --- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.h +++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.h @@ -3,7 +3,7 @@ // #import "OWSPrimaryStorage.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m index 3475ff6f9..a96461456 100644 --- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m +++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m @@ -7,7 +7,7 @@ #import "SSKEnvironment.h" #import "YapDatabaseConnection+OWS.h" #import "YapDatabaseTransaction+OWS.h" -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.h b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.h index 752581f57..5f25bc827 100644 --- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.h +++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.h @@ -3,7 +3,7 @@ // #import "OWSPrimaryStorage.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m index bc9be2751..413ddfe67 100644 --- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m +++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SignedPreKeyStore.m @@ -7,9 +7,9 @@ #import "OWSPrimaryStorage+PreKeyStore.h" #import "OWSPrimaryStorage+keyFromIntLong.h" #import "YapDatabaseConnection+OWS.h" -#import -#import -#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Storage/OWSPrimaryStorage.m b/SignalServiceKit/src/Storage/OWSPrimaryStorage.m index f05fcc8b9..17db09724 100644 --- a/SignalServiceKit/src/Storage/OWSPrimaryStorage.m +++ b/SignalServiceKit/src/Storage/OWSPrimaryStorage.m @@ -18,7 +18,7 @@ #import "SSKEnvironment.h" #import "TSDatabaseSecondaryIndexes.h" #import "TSDatabaseView.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Storage/OWSStorage.m b/SignalServiceKit/src/Storage/OWSStorage.m index 11c6d1cbe..e3c419411 100644 --- a/SignalServiceKit/src/Storage/OWSStorage.m +++ b/SignalServiceKit/src/Storage/OWSStorage.m @@ -11,9 +11,9 @@ #import "OWSPrimaryStorage.h" #import "OWSStorage+Subclass.h" #import "TSAttachmentStream.h" -#import -#import -#import +#import +#import +#import #import #import #import diff --git a/SignalServiceKit/src/Storage/SSKJobRecord.m b/SignalServiceKit/src/Storage/SSKJobRecord.m index d27714167..0f107c45b 100644 --- a/SignalServiceKit/src/Storage/SSKJobRecord.m +++ b/SignalServiceKit/src/Storage/SSKJobRecord.m @@ -3,7 +3,7 @@ // #import "SSKJobRecord.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m index 03dd59763..b260bc704 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m +++ b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m @@ -3,10 +3,10 @@ // #import "YapDatabaseConnection+OWS.h" -#import -#import -#import -#import +#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m index 6f7f25a45..b461030e1 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m +++ b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m @@ -3,10 +3,10 @@ // #import "YapDatabaseTransaction+OWS.h" -#import -#import -#import -#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/TSPrefix.h b/SignalServiceKit/src/TSPrefix.h index fce828264..3446f84a7 100644 --- a/SignalServiceKit/src/TSPrefix.h +++ b/SignalServiceKit/src/TSPrefix.h @@ -17,5 +17,5 @@ static const NSUInteger ddLogLevel = DDLogLevelInfo; #import "NSObject+Casting.h" #import "SSKAsserts.h" #import "TSConstants.h" -#import -#import +#import +#import diff --git a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m index b4f4174bf..9946757f0 100644 --- a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m +++ b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m @@ -23,7 +23,7 @@ #import "OWSReadReceiptManager.h" #import "TSAccountManager.h" #import "TSSocketManager.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m index 3218878e5..6cd32aaae 100644 --- a/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m +++ b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m @@ -3,7 +3,7 @@ // #import "OWSFakeMessageSender.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m index 9de2bbcde..762edd6cd 100644 --- a/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m +++ b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m @@ -4,8 +4,8 @@ #import "OWSFakeProfileManager.h" #import "TSThread.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/TestUtils/TestAppContext.m b/SignalServiceKit/src/TestUtils/TestAppContext.m index 191442f93..89eb530b9 100644 --- a/SignalServiceKit/src/TestUtils/TestAppContext.m +++ b/SignalServiceKit/src/TestUtils/TestAppContext.m @@ -3,8 +3,8 @@ // #import "TestAppContext.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/AppReadiness.m b/SignalServiceKit/src/Util/AppReadiness.m index fb90398d6..8885e202b 100755 --- a/SignalServiceKit/src/Util/AppReadiness.m +++ b/SignalServiceKit/src/Util/AppReadiness.m @@ -3,7 +3,7 @@ // #import "AppReadiness.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/AppVersion.m b/SignalServiceKit/src/Util/AppVersion.m index 4eda544e3..5362c1d3b 100755 --- a/SignalServiceKit/src/Util/AppVersion.m +++ b/SignalServiceKit/src/Util/AppVersion.m @@ -3,7 +3,7 @@ // #import "AppVersion.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/DataSource.m b/SignalServiceKit/src/Util/DataSource.m index 468a21b20..85bf7bf91 100755 --- a/SignalServiceKit/src/Util/DataSource.m +++ b/SignalServiceKit/src/Util/DataSource.m @@ -6,9 +6,9 @@ #import "MIMETypeUtil.h" #import "NSData+Image.h" #import "OWSFileSystem.h" -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/DeviceNames.swift b/SignalServiceKit/src/Util/DeviceNames.swift index e82818401..e01db2cc8 100644 --- a/SignalServiceKit/src/Util/DeviceNames.swift +++ b/SignalServiceKit/src/Util/DeviceNames.swift @@ -3,8 +3,8 @@ // import Foundation -import Curve25519Kit -import AxolotlKit +import SessionCurve25519Kit +import SessionAxolotlKit @objc public enum DeviceNameError: Int, Error { diff --git a/SignalServiceKit/src/Util/NSData+Image.m b/SignalServiceKit/src/Util/NSData+Image.m index 1463758fa..b29bf3585 100644 --- a/SignalServiceKit/src/Util/NSData+Image.m +++ b/SignalServiceKit/src/Util/NSData+Image.m @@ -6,7 +6,7 @@ #import "MIMETypeUtil.h" #import "OWSFileSystem.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/NSString+SSK.h b/SignalServiceKit/src/Util/NSString+SSK.h index d64ae2111..65affca06 100644 --- a/SignalServiceKit/src/Util/NSString+SSK.h +++ b/SignalServiceKit/src/Util/NSString+SSK.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/OWS2FAManager.m b/SignalServiceKit/src/Util/OWS2FAManager.m index e7a897565..530534fc0 100644 --- a/SignalServiceKit/src/Util/OWS2FAManager.m +++ b/SignalServiceKit/src/Util/OWS2FAManager.m @@ -10,7 +10,7 @@ #import "TSAccountManager.h" #import "TSNetworkManager.h" #import "YapDatabaseConnection+OWS.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/OWSAnalytics.m b/SignalServiceKit/src/Util/OWSAnalytics.m index f7c070c41..29a300bdc 100755 --- a/SignalServiceKit/src/Util/OWSAnalytics.m +++ b/SignalServiceKit/src/Util/OWSAnalytics.m @@ -11,7 +11,7 @@ #import "YapDatabaseConnection+OWS.h" #import #import -#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/OWSBackgroundTask.m b/SignalServiceKit/src/Util/OWSBackgroundTask.m index af746bf41..ec007a04b 100644 --- a/SignalServiceKit/src/Util/OWSBackgroundTask.m +++ b/SignalServiceKit/src/Util/OWSBackgroundTask.m @@ -5,7 +5,7 @@ #import "OWSBackgroundTask.h" #import "AppContext.h" #import "NSTimer+OWS.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/OWSFileSystem.m b/SignalServiceKit/src/Util/OWSFileSystem.m index 4f2d5c3ac..7938639c1 100644 --- a/SignalServiceKit/src/Util/OWSFileSystem.m +++ b/SignalServiceKit/src/Util/OWSFileSystem.m @@ -5,7 +5,7 @@ #import "OWSFileSystem.h" #import "OWSError.h" #import "TSConstants.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/src/Util/SSKAsserts.h b/SignalServiceKit/src/Util/SSKAsserts.h index 496b00ca1..f63bcdb7d 100755 --- a/SignalServiceKit/src/Util/SSKAsserts.h +++ b/SignalServiceKit/src/Util/SSKAsserts.h @@ -3,8 +3,8 @@ // #import "AppContext.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/tests/Account/SignedPreKeyDeletionTests.m b/SignalServiceKit/tests/Account/SignedPreKeyDeletionTests.m index 8788fe965..efaf491b6 100644 --- a/SignalServiceKit/tests/Account/SignedPreKeyDeletionTests.m +++ b/SignalServiceKit/tests/Account/SignedPreKeyDeletionTests.m @@ -5,7 +5,7 @@ #import "OWSPrimaryStorage+SignedPreKeyStore.h" #import "SSKBaseTestObjC.h" #import "TSPreKeyManager.h" -#import +#import @interface TSPreKeyManager (Testing) diff --git a/SignalServiceKit/tests/Contacts/SignalRecipientTest.m b/SignalServiceKit/tests/Contacts/SignalRecipientTest.m index ea92dab36..6e3393e94 100644 --- a/SignalServiceKit/tests/Contacts/SignalRecipientTest.m +++ b/SignalServiceKit/tests/Contacts/SignalRecipientTest.m @@ -8,7 +8,7 @@ #import "SignalRecipient.h" #import "TSAccountManager.h" #import "TestAppContext.h" -#import +#import @interface TSAccountManager (Testing) diff --git a/SignalServiceKit/tests/Contacts/TSThreadTest.m b/SignalServiceKit/tests/Contacts/TSThreadTest.m index 83fcf6b47..3dc54b070 100644 --- a/SignalServiceKit/tests/Contacts/TSThreadTest.m +++ b/SignalServiceKit/tests/Contacts/TSThreadTest.m @@ -10,7 +10,7 @@ #import "TSIncomingMessage.h" #import "TSOutgoingMessage.h" #import "TestAppContext.h" -#import +#import @interface TSThreadTest : SSKBaseTestObjC diff --git a/SignalServiceKit/tests/Devices/OWSProvisioningCipherTest.m b/SignalServiceKit/tests/Devices/OWSProvisioningCipherTest.m index 359259a76..77e5df03c 100644 --- a/SignalServiceKit/tests/Devices/OWSProvisioningCipherTest.m +++ b/SignalServiceKit/tests/Devices/OWSProvisioningCipherTest.m @@ -3,9 +3,9 @@ // #import "SSKBaseTestObjC.h" -#import -#import -#import +#import +#import +#import @interface OWSProvisioningCipher(Testing) diff --git a/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m b/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m index 2dd8cf96f..5a382dc33 100644 --- a/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m +++ b/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m @@ -6,7 +6,7 @@ #import "SSKBaseTestObjC.h" #import "TSAttachmentStream.h" #import "TSContactThread.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m b/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m index 635e9a81c..fcdc6bcb0 100644 --- a/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m +++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m @@ -9,8 +9,8 @@ #import "TSContactThread.h" #import "TSMessage.h" #import "TestAppContext.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m index 685723b81..1c5d24211 100644 --- a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m +++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m @@ -9,7 +9,7 @@ #import "SSKBaseTestObjC.h" #import "TSContactThread.h" #import "TSMessage.h" -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift index 97ce56fb7..160ab2734 100644 --- a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift +++ b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift @@ -3,7 +3,7 @@ // import Foundation -@testable import SignalServiceKit +@testable import SessionServiceKit import XCTest func XCTAssertMatch(expectedPattern: String, actualText: String, file: StaticString = #file, line: UInt = #line) { diff --git a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m index 71a57955a..39dc429c3 100644 --- a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m +++ b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m @@ -15,8 +15,8 @@ #import "SSKBaseTestObjC.h" #import "TSGroupThread.h" #import "TSNetworkManager.h" -#import -#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m index 4a5c4c542..0d28dabc9 100644 --- a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m +++ b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m @@ -17,9 +17,9 @@ #import "TSNetworkManager.h" #import "TSOutgoingMessage.h" #import "TSRequest.h" -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalServiceKit/tests/Messages/OWSUDManagerTest.swift b/SignalServiceKit/tests/Messages/OWSUDManagerTest.swift index a4f57e21c..50a0904ae 100644 --- a/SignalServiceKit/tests/Messages/OWSUDManagerTest.swift +++ b/SignalServiceKit/tests/Messages/OWSUDManagerTest.swift @@ -4,9 +4,9 @@ import XCTest import Foundation -import SignalCoreKit -import SignalMetadataKit -@testable import SignalServiceKit +import SessionCoreKit +import SessionMetadataKit +@testable import SessionServiceKit class MockCertificateValidator: NSObject, SMKCertificateValidator { @objc public func throwswrapped_validate(senderCertificate: SMKSenderCertificate, validationTime: UInt64) throws { diff --git a/SignalServiceKit/tests/Network/MessageSendJobQueueTest.swift b/SignalServiceKit/tests/Network/MessageSendJobQueueTest.swift index c8477aa1f..5cd8eaace 100644 --- a/SignalServiceKit/tests/Network/MessageSendJobQueueTest.swift +++ b/SignalServiceKit/tests/Network/MessageSendJobQueueTest.swift @@ -3,7 +3,7 @@ // import XCTest -@testable import SignalServiceKit +@testable import SessionServiceKit class MessageSenderJobQueueTest: SSKBaseTestSwift { diff --git a/SignalServiceKit/tests/Network/MessageSenderJobRecordTest.swift b/SignalServiceKit/tests/Network/MessageSenderJobRecordTest.swift index 32ccd2696..1b401c9e4 100644 --- a/SignalServiceKit/tests/Network/MessageSenderJobRecordTest.swift +++ b/SignalServiceKit/tests/Network/MessageSenderJobRecordTest.swift @@ -4,7 +4,7 @@ import Foundation import XCTest -@testable import SignalServiceKit +@testable import SessionServiceKit let kMessageSenderJobRecordLabel = "MessageSender" class SSKMessageSenderJobRecordTest: SSKBaseTestSwift { diff --git a/SignalServiceKit/tests/SSKBaseTestObjC.h b/SignalServiceKit/tests/SSKBaseTestObjC.h index 9b1007a9a..40e69f9de 100644 --- a/SignalServiceKit/tests/SSKBaseTestObjC.h +++ b/SignalServiceKit/tests/SSKBaseTestObjC.h @@ -2,7 +2,7 @@ // Copyright (c) 2018 Open Whisper Systems. All rights reserved. // -#import +#import #import #import diff --git a/SignalServiceKit/tests/SSKBaseTestSwift.swift b/SignalServiceKit/tests/SSKBaseTestSwift.swift index aa928b35a..6e8163373 100644 --- a/SignalServiceKit/tests/SSKBaseTestSwift.swift +++ b/SignalServiceKit/tests/SSKBaseTestSwift.swift @@ -3,7 +3,7 @@ // import XCTest -import SignalServiceKit +import SessionServiceKit import CocoaLumberjack @objc diff --git a/SignalServiceKit/tests/Security/OWSFingerprintTest.m b/SignalServiceKit/tests/Security/OWSFingerprintTest.m index 27e0bbf0e..96a960f0f 100644 --- a/SignalServiceKit/tests/Security/OWSFingerprintTest.m +++ b/SignalServiceKit/tests/Security/OWSFingerprintTest.m @@ -4,7 +4,7 @@ #import "OWSFingerprint.h" #import "SSKBaseTestObjC.h" -#import +#import @interface OWSFingerprintTest : SSKBaseTestObjC diff --git a/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m b/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m index e92f62eaf..5844862a5 100644 --- a/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m +++ b/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m @@ -9,8 +9,8 @@ #import "SSKBaseTestObjC.h" #import "SSKEnvironment.h" #import "YapDatabaseConnection+OWS.h" -#import -#import +#import +#import extern NSString *const OWSPrimaryStorageTrustedKeysCollection; diff --git a/SignalServiceKit/tests/Util/DeviceNamesTest.swift b/SignalServiceKit/tests/Util/DeviceNamesTest.swift index a8ca372de..e96d31d12 100644 --- a/SignalServiceKit/tests/Util/DeviceNamesTest.swift +++ b/SignalServiceKit/tests/Util/DeviceNamesTest.swift @@ -4,9 +4,9 @@ import Foundation import XCTest -import Curve25519Kit +import SessionCurve25519Kit -@testable import SignalServiceKit +@testable import SessionServiceKit class DeviceNamesTest: SSKBaseTestSwift { diff --git a/SignalServiceKit/tests/Util/JobQueueTest.swift b/SignalServiceKit/tests/Util/JobQueueTest.swift index 8516f8c08..d85ae96cb 100644 --- a/SignalServiceKit/tests/Util/JobQueueTest.swift +++ b/SignalServiceKit/tests/Util/JobQueueTest.swift @@ -5,7 +5,7 @@ import Foundation import XCTest -@testable import SignalServiceKit +@testable import SessionServiceKit class TestJobRecord: SSKJobRecord { diff --git a/SignalServiceKit/tests/Util/TSMessageStorageTests.m b/SignalServiceKit/tests/Util/TSMessageStorageTests.m index 5f702fae1..06773a190 100644 --- a/SignalServiceKit/tests/Util/TSMessageStorageTests.m +++ b/SignalServiceKit/tests/Util/TSMessageStorageTests.m @@ -11,7 +11,7 @@ #import "TSOutgoingMessage.h" #import "TSThread.h" #import "YapDatabaseConnection+OWS.h" -#import +#import @interface TSMessageStorageTests : SSKBaseTestObjC diff --git a/SignalShareExtension/SAEScreenLockViewController.m b/SignalShareExtension/SAEScreenLockViewController.m index 391be324c..e20531b69 100644 --- a/SignalShareExtension/SAEScreenLockViewController.m +++ b/SignalShareExtension/SAEScreenLockViewController.m @@ -5,7 +5,7 @@ #import "SAEScreenLockViewController.h" #import "UIColor+OWS.h" #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalShareExtension/ShareViewController.swift b/SignalShareExtension/ShareViewController.swift index fc32db9ef..505bebeb1 100644 --- a/SignalShareExtension/ShareViewController.swift +++ b/SignalShareExtension/ShareViewController.swift @@ -6,7 +6,7 @@ import UIKit import SignalMessaging import PureLayout -import SignalServiceKit +import SessionServiceKit import PromiseKit @objc diff --git a/SignalShareExtension/SignalShareExtension-Bridging-Header.h b/SignalShareExtension/SignalShareExtension-Bridging-Header.h index bc241fe7c..010ecfd30 100644 --- a/SignalShareExtension/SignalShareExtension-Bridging-Header.h +++ b/SignalShareExtension/SignalShareExtension-Bridging-Header.h @@ -8,9 +8,9 @@ // Separate iOS Frameworks from other imports. #import "SAEScreenLockViewController.h" #import "ShareAppExtensionContext.h" -#import -#import -#import +#import +#import +#import #import #import #import @@ -19,9 +19,9 @@ #import #import #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import diff --git a/SignalShareExtension/SignalShareExtension-Prefix.pch b/SignalShareExtension/SignalShareExtension-Prefix.pch index 881d5e4c7..c89ce4a9b 100644 --- a/SignalShareExtension/SignalShareExtension-Prefix.pch +++ b/SignalShareExtension/SignalShareExtension-Prefix.pch @@ -15,7 +15,7 @@ static const NSUInteger ddLogLevel = DDLogLevelInfo; #endif - #import - #import - #import + #import + #import + #import #endif diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.h b/SignalShareExtension/utils/ShareAppExtensionContext.h index ab176cf42..55ac866a1 100644 --- a/SignalShareExtension/utils/ShareAppExtensionContext.h +++ b/SignalShareExtension/utils/ShareAppExtensionContext.h @@ -2,7 +2,7 @@ // Copyright (c) 2017 Open Whisper Systems. All rights reserved. // -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.m b/SignalShareExtension/utils/ShareAppExtensionContext.m index 2635afd28..c13c31be5 100644 --- a/SignalShareExtension/utils/ShareAppExtensionContext.m +++ b/SignalShareExtension/utils/ShareAppExtensionContext.m @@ -4,9 +4,9 @@ #import "ShareAppExtensionContext.h" #import -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN