From aeb3cecf558ec78898a17922f46f1e58310f1b4b Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 3 May 2019 07:58:48 +1000 Subject: [PATCH] WIP --- Signal.xcodeproj/project.pbxproj | 10 +- Signal/src/AppDelegate.m | 2 +- .../AppSettings/AboutTableViewController.m | 2 +- .../AdvancedSettingsTableViewController.m | 2 +- .../AppSettings/AppSettingsViewController.m | 2 +- .../AppSettings/BlockListViewController.m | 2 +- ...otificationSettingsOptionsViewController.m | 2 +- .../OWSBackupSettingsViewController.m | 2 +- .../AppSettings/OWSLinkDeviceViewController.m | 2 +- .../OWSLinkedDevicesTableViewController.m | 2 +- .../PrivacySettingsTableViewController.m | 2 +- Signal/src/ViewControllers/AvatarViewHelper.m | 2 +- .../Cells/OWSAudioMessageView.m | 2 +- .../Cells/OWSContactOffersCell.m | 2 +- .../Cells/OWSContactShareButtonsView.m | 2 +- .../Cells/OWSContactShareView.m | 2 +- .../Cells/OWSGenericAttachmentView.m | 2 +- .../Cells/OWSMessageBubbleView.m | 2 +- .../ConversationView/Cells/OWSMessageCell.m | 2 +- .../Cells/OWSMessageFooterView.m | 2 +- .../Cells/OWSMessageHeaderView.m | 2 +- .../Cells/OWSQuotedMessageView.m | 2 +- .../Cells/OWSSystemMessageCell.m | 2 +- .../ConversationInputTextView.m | 2 +- .../ConversationInputToolbar.m | 2 +- .../ConversationViewController.m | 2 +- .../ConversationView/ConversationViewItem.m | 2 +- .../ConversationView/ConversationViewLayout.m | 2 +- .../ConversationView/ConversationViewModel.m | 2 +- .../DebugUI/DebugContactsUtils.m | 2 +- .../ViewControllers/DebugUI/DebugUIBackup.m | 2 +- .../ViewControllers/DebugUI/DebugUIContacts.m | 2 +- .../DebugUI/DebugUIDiskUsage.m | 2 +- .../ViewControllers/DebugUI/DebugUIMessages.m | 2 +- .../src/ViewControllers/DebugUI/DebugUIMisc.m | 2 +- .../DebugUI/DebugUISessionState.m | 2 +- .../DebugUI/DebugUISyncMessages.m | 2 +- .../DebugUI/DebugUITableViewController.m | 2 +- .../ViewControllers/HomeView/HomeViewCell.m | 2 +- .../HomeView/HomeViewController.m | 2 +- .../MediaDetailViewController.m | 2 +- .../NewContactThreadViewController.m | 94 ++++++++++--------- .../ViewControllers/NewGroupViewController.m | 2 +- .../OWS2FASettingsViewController.m | 2 +- .../ViewControllers/ProfileViewController.m | 2 +- .../SignalsNavigationController.m | 2 +- .../ThreadSettings/AddToGroupViewController.m | 2 +- .../FingerprintViewController.m | 2 +- .../FingerprintViewScanController.m | 2 +- .../OWSConversationSettingsViewController.m | 2 +- .../ShowGroupMembersViewController.m | 2 +- .../UpdateGroupViewController.m | 2 +- Signal/src/environment/SignalApp.m | 2 +- Signal/src/util/Backup/OWSBackup.m | 2 +- Signal/src/util/Backup/OWSBackupExportJob.m | 2 +- Signal/src/util/Backup/OWSBackupImportJob.m | 2 +- Signal/src/util/Backup/OWSBackupJob.m | 2 +- Signal/src/util/MainAppContext.m | 2 +- Signal/src/util/OWSScreenLockUI.m | 2 +- Signal/src/util/Pastelog.m | 2 +- Signal/src/util/RegistrationUtils.m | 2 +- .../src/util/UIViewController+Permissions.m | 2 +- Signal/src/views/PinEntryView.m | 2 +- .../translations/en.lproj/Localizable.strings | 7 +- 64 files changed, 120 insertions(+), 113 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index ae30a2082..590d5a7ce 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -1366,7 +1366,7 @@ D17BB5C25D615AB49813100C /* Pods_Signal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Signal.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D2179CFB16BB0B3A0006F3AB /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; D2179CFD16BB0B480006F3AB /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; - D221A089169C9E5E00537ABF /* Signal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Signal.app; sourceTree = BUILT_PRODUCTS_DIR; }; + D221A089169C9E5E00537ABF /* Session.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Session.app; sourceTree = BUILT_PRODUCTS_DIR; }; D221A08D169C9E5E00537ABF /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; D221A08F169C9E5E00537ABF /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; D221A091169C9E5E00537ABF /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -2650,7 +2650,7 @@ D221A08A169C9E5E00537ABF /* Products */ = { isa = PBXGroup; children = ( - D221A089169C9E5E00537ABF /* Signal.app */, + D221A089169C9E5E00537ABF /* Session.app */, D221A0AA169C9E5F00537ABF /* SignalTests.xctest */, 453518681FC635DD00210559 /* SignalShareExtension.appex */, 453518921FC63DBF00210559 /* SignalMessaging.framework */, @@ -2886,7 +2886,7 @@ ); name = Signal; productName = RedPhone; - productReference = D221A089169C9E5E00537ABF /* Signal.app */; + productReference = D221A089169C9E5E00537ABF /* Session.app */; productType = "com.apple.product-type.application"; }; D221A0A9169C9E5F00537ABF /* SignalTests */ = { @@ -4383,7 +4383,7 @@ LLVM_LTO = NO; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "com.niels-andriesse.loki-network.Loki-Messenger"; - PRODUCT_NAME = Signal; + PRODUCT_NAME = Session; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; RUN_CLANG_STATIC_ANALYZER = YES; @@ -4448,7 +4448,7 @@ LLVM_LTO = NO; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "com.niels-andriesse.loki-network.Loki-Messenger"; - PRODUCT_NAME = Signal; + PRODUCT_NAME = Session; PROVISIONING_PROFILE = ""; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 26cbab7ae..b1ec60158 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -11,7 +11,7 @@ #import "OWSOrphanDataCleaner.h" #import "OWSScreenLockUI.h" #import "Pastelog.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalApp.h" #import "SignalsNavigationController.h" #import "ViewControllerUtils.h" diff --git a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m index 4a592b66e..ef695f94d 100644 --- a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m @@ -3,7 +3,7 @@ // #import "AboutTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIView+OWS.h" #import #import diff --git a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m index f5a5fbda7..251ebab6d 100644 --- a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m @@ -7,7 +7,7 @@ #import "DomainFrontingCountryViewController.h" #import "OWSCountryMetadata.h" #import "Pastelog.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "TSAccountManager.h" #import #import diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m index e6d7ddbb5..c0045cd5e 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m @@ -14,7 +14,7 @@ #import "PrivacySettingsTableViewController.h" #import "ProfileViewController.h" #import "RegistrationUtils.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m index 2a02ff318..607583fff 100644 --- a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m +++ b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m @@ -9,7 +9,7 @@ #import "ContactsViewHelper.h" #import "OWSTableViewController.h" #import "PhoneNumber.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" #import diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m index 280c7d48a..6db89971b 100644 --- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m @@ -3,7 +3,7 @@ // #import "NotificationSettingsOptionsViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalApp.h" #import diff --git a/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m index 3ea0311aa..794d75b68 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m @@ -4,7 +4,7 @@ #import "OWSBackupSettingsViewController.h" #import "OWSBackup.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "ThreadUtil.h" #import #import diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m index 5c40bd474..c4f4dee4e 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m @@ -5,7 +5,7 @@ #import "OWSLinkDeviceViewController.h" #import "OWSDeviceProvisioningURLParser.h" #import "OWSLinkedDevicesTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m index d3285b495..2f4d4d914 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m @@ -5,7 +5,7 @@ #import "OWSLinkedDevicesTableViewController.h" #import "OWSDeviceTableViewCell.h" #import "OWSLinkDeviceViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIViewController+Permissions.h" #import #import diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 0004f12f3..58ef207e1 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -5,7 +5,7 @@ #import "PrivacySettingsTableViewController.h" #import "BlockListViewController.h" #import "OWS2FASettingsViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/AvatarViewHelper.m b/Signal/src/ViewControllers/AvatarViewHelper.m index 72c5e5073..39dae09c9 100644 --- a/Signal/src/ViewControllers/AvatarViewHelper.m +++ b/Signal/src/ViewControllers/AvatarViewHelper.m @@ -4,7 +4,7 @@ #import "AvatarViewHelper.h" #import "OWSNavigationController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m index 6493dd419..8d8857d01 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m @@ -4,7 +4,7 @@ #import "OWSAudioMessageView.h" #import "ConversationViewItem.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIColor+OWS.h" #import "ViewControllerUtils.h" #import diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m index 48b9e4783..17f8d962e 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m @@ -4,7 +4,7 @@ #import "OWSContactOffersCell.h" #import "ConversationViewItem.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m index ec3dcd0a9..63678983f 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m @@ -3,7 +3,7 @@ // #import "OWSContactShareButtonsView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m index 7a77d1647..ba699921a 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m @@ -4,7 +4,7 @@ #import "OWSContactShareView.h" #import "OWSContactAvatarBuilder.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m index 2508ced75..567850ac8 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m @@ -4,7 +4,7 @@ #import "OWSGenericAttachmentView.h" #import "OWSBezierPathView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" #import "ViewControllerUtils.h" diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 1e87f7043..53f6ea773 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -15,7 +15,7 @@ #import "OWSMessageFooterView.h" #import "OWSMessageTextView.h" #import "OWSQuotedMessageView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIColor+OWS.h" #import diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index 1da289a14..874ccb575 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m @@ -6,7 +6,7 @@ #import "OWSContactAvatarBuilder.h" #import "OWSMessageBubbleView.h" #import "OWSMessageHeaderView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m index 69c18e14c..82a50af56 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m @@ -6,7 +6,7 @@ #import "DateUtil.h" #import "OWSLabel.h" #import "OWSMessageTimerView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m index 884b6e664..69809cb4f 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m @@ -4,7 +4,7 @@ #import "OWSMessageHeaderView.h" #import "ConversationViewItem.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m index 66223d1e4..6ba594f2e 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m @@ -6,7 +6,7 @@ #import "ConversationViewItem.h" #import "Environment.h" #import "OWSBubbleView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m index f44c4c132..f5b34fedb 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m @@ -5,7 +5,7 @@ #import "OWSSystemMessageCell.h" #import "ConversationViewItem.h" #import "OWSMessageHeaderView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m index be67f543d..850612c31 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m @@ -3,7 +3,7 @@ // #import "ConversationInputTextView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 048809530..95155cd84 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -7,7 +7,7 @@ #import "Environment.h" #import "OWSContactsManager.h" #import "OWSMath.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "ViewControllerUtils.h" diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index a9f4b9feb..332961209 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -28,7 +28,7 @@ #import "OWSMath.h" #import "OWSMessageCell.h" #import "OWSSystemMessageCell.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalKeyingStorage.h" #import "TSAttachmentPointer.h" #import "TSCall.h" diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index 9f2f6a2a0..9d307c133 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -8,7 +8,7 @@ #import "OWSMessageCell.h" #import "OWSMessageHeaderView.h" #import "OWSSystemMessageCell.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m index 96e51af42..6d4f40552 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m @@ -3,7 +3,7 @@ // #import "ConversationViewLayout.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIView+OWS.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index 3c34ab266..18ce348f3 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -7,7 +7,7 @@ #import "DateUtil.h" #import "OWSMessageBubbleView.h" #import "OWSQuotedReplyModel.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m index 62ff70a2a..d21b2bd64 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m +++ b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m @@ -3,7 +3,7 @@ // #import "DebugContactsUtils.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m b/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m index ff28bc951..ead566d0c 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m @@ -5,7 +5,7 @@ #import "DebugUIBackup.h" #import "OWSBackup.h" #import "OWSTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m index b2e6a4375..28061fb4f 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m @@ -5,7 +5,7 @@ #import "DebugUIContacts.h" #import "DebugContactsUtils.h" #import "OWSTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalApp.h" #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m index 05f8dd5f4..b2955a2af 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m @@ -5,7 +5,7 @@ #import "DebugUIDiskUsage.h" #import "OWSOrphanDataCleaner.h" #import "OWSTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index f1941b9d5..90fd5b4c4 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -8,7 +8,7 @@ #import "DebugUIMessagesAction.h" #import "DebugUIMessagesAssetLoader.h" #import "OWSTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m index a3671bd51..43b2d183e 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m @@ -7,7 +7,7 @@ #import "OWSBackup.h" #import "OWSCountryMetadata.h" #import "OWSTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "ThreadUtil.h" #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m index 91856eac5..40b6a08a3 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m @@ -4,7 +4,7 @@ #import "DebugUISessionState.h" #import "OWSTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m index b7ef29180..cc493cd89 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m @@ -5,7 +5,7 @@ #import "DebugUISyncMessages.h" #import "DebugUIContacts.h" #import "OWSTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "ThreadUtil.h" #import #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m index f4fa7aa56..39e895ec4 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m @@ -11,7 +11,7 @@ #import "DebugUISessionState.h" #import "DebugUIStress.h" #import "DebugUISyncMessages.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m index 8b6b58093..d95af9bb1 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m @@ -4,7 +4,7 @@ #import "HomeViewCell.h" #import "OWSAvatarBuilder.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 3806974b9..c0b3f9d56 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -11,7 +11,7 @@ #import "OWSPrimaryStorage.h" #import "ProfileViewController.h" #import "RegistrationUtils.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalApp.h" #import "TSAccountManager.h" #import "TSDatabaseView.h" diff --git a/Signal/src/ViewControllers/MediaDetailViewController.m b/Signal/src/ViewControllers/MediaDetailViewController.m index 697a0eefa..9874c83c3 100644 --- a/Signal/src/ViewControllers/MediaDetailViewController.m +++ b/Signal/src/ViewControllers/MediaDetailViewController.m @@ -7,7 +7,7 @@ #import "ConversationViewController.h" #import "ConversationViewItem.h" #import "OWSMessageCell.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "TSAttachmentStream.h" #import "TSInteraction.h" #import "UIColor+OWS.h" diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m index e41d5530e..7d8c7b48e 100644 --- a/Signal/src/ViewControllers/NewContactThreadViewController.m +++ b/Signal/src/ViewControllers/NewContactThreadViewController.m @@ -8,7 +8,7 @@ #import "NewGroupViewController.h" #import "NewNonContactConversationViewController.h" #import "OWSTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalApp.h" #import "UIColor+OWS.h" #import "UIView+OWS.h" @@ -106,18 +106,21 @@ NS_ASSUME_NONNULL_BEGIN target:self action:@selector(dismissPressed) accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"stop")]; - // TODO: We should use separate RTL and LTR flavors of this asset. - UIImage *newGroupImage = [UIImage imageNamed:@"btnGroup--white"]; - OWSAssertDebug(newGroupImage); - UIBarButtonItem *newGroupButton = - [[UIBarButtonItem alloc] initWithImage:newGroupImage - style:UIBarButtonItemStylePlain - target:self - action:@selector(showNewGroupView:) - accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"new_group")]; - newGroupButton.accessibilityLabel - = NSLocalizedString(@"CREATE_NEW_GROUP", @"Accessibility label for the create group new group button"); - self.navigationItem.rightBarButtonItem = newGroupButton; + // Loki: Original code + // ======== +// // TODO: We should use separate RTL and LTR flavors of this asset. +// UIImage *newGroupImage = [UIImage imageNamed:@"btnGroup--white"]; +// OWSAssertDebug(newGroupImage); +// UIBarButtonItem *newGroupButton = +// [[UIBarButtonItem alloc] initWithImage:newGroupImage +// style:UIBarButtonItemStylePlain +// target:self +// action:@selector(showNewGroupView:) +// accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"new_group")]; +// newGroupButton.accessibilityLabel +// = NSLocalizedString(@"CREATE_NEW_GROUP", @"Accessibility label for the create group new group button"); +// self.navigationItem.rightBarButtonItem = newGroupButton; + // ======== // Search UISearchBar *searchBar = [OWSSearchBar new]; @@ -352,37 +355,40 @@ NS_ASSUME_NONNULL_BEGIN [contents addSection:reminderSection]; } - OWSTableSection *staticSection = [OWSTableSection new]; - - // Find Non-Contacts by Phone Number - [staticSection - addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"NEW_CONVERSATION_FIND_BY_PHONE_NUMBER", - @"A label the cell that lets you add a new member to a group.") - accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( - NewContactThreadViewController, @"find_by_phone") - customRowHeight:UITableViewAutomaticDimension - actionBlock:^{ - NewNonContactConversationViewController *viewController = - [NewNonContactConversationViewController new]; - viewController.nonContactConversationDelegate = weakSelf; - [weakSelf.navigationController pushViewController:viewController - animated:YES]; - }]]; - - if (self.contactsManager.isSystemContactsAuthorized) { - // Invite Contacts - [staticSection - addItem:[OWSTableItem - disclosureItemWithText:NSLocalizedString(@"INVITE_FRIENDS_CONTACT_TABLE_BUTTON", - @"Label for the cell that presents the 'invite contacts' workflow.") - accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( - NewContactThreadViewController, @"invite_contacts") - customRowHeight:UITableViewAutomaticDimension - actionBlock:^{ - [weakSelf presentInviteFlow]; - }]]; - } - [contents addSection:staticSection]; + // Loki: Original code + // ======== +// OWSTableSection *staticSection = [OWSTableSection new]; +// +// // Find Non-Contacts by Phone Number +// [staticSection +// addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"NEW_CONVERSATION_FIND_BY_PHONE_NUMBER", +// @"A label the cell that lets you add a new member to a group.") +// accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( +// NewContactThreadViewController, @"find_by_phone") +// customRowHeight:UITableViewAutomaticDimension +// actionBlock:^{ +// NewNonContactConversationViewController *viewController = +// [NewNonContactConversationViewController new]; +// viewController.nonContactConversationDelegate = weakSelf; +// [weakSelf.navigationController pushViewController:viewController +// animated:YES]; +// }]]; +// +// if (self.contactsManager.isSystemContactsAuthorized) { +// // Invite Contacts +// [staticSection +// addItem:[OWSTableItem +// disclosureItemWithText:NSLocalizedString(@"INVITE_FRIENDS_CONTACT_TABLE_BUTTON", +// @"Label for the cell that presents the 'invite contacts' workflow.") +// accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( +// NewContactThreadViewController, @"invite_contacts") +// customRowHeight:UITableViewAutomaticDimension +// actionBlock:^{ +// [weakSelf presentInviteFlow]; +// }]]; +// } +// [contents addSection:staticSection]; + // ======== BOOL hasSearchText = self.searchText.length > 0; diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m index fbe7b3926..d58dd6677 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.m +++ b/Signal/src/ViewControllers/NewGroupViewController.m @@ -6,7 +6,7 @@ #import "AddToGroupViewController.h" #import "AvatarViewHelper.h" #import "OWSNavigationController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalApp.h" #import #import diff --git a/Signal/src/ViewControllers/OWS2FASettingsViewController.m b/Signal/src/ViewControllers/OWS2FASettingsViewController.m index fae3c0e25..e090b7ecd 100644 --- a/Signal/src/ViewControllers/OWS2FASettingsViewController.m +++ b/Signal/src/ViewControllers/OWS2FASettingsViewController.m @@ -4,7 +4,7 @@ #import "OWS2FASettingsViewController.h" #import "OWSTableViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalMessaging.h" #import #import diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index b8dd26d5a..6b4f3dc79 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -7,7 +7,7 @@ #import "AvatarViewHelper.h" #import "HomeViewController.h" #import "OWSNavigationController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalsNavigationController.h" #import "UIColor+OWS.h" #import "UIFont+OWS.h" diff --git a/Signal/src/ViewControllers/SignalsNavigationController.m b/Signal/src/ViewControllers/SignalsNavigationController.m index 00d050f49..152bb2c83 100644 --- a/Signal/src/ViewControllers/SignalsNavigationController.m +++ b/Signal/src/ViewControllers/SignalsNavigationController.m @@ -3,7 +3,7 @@ // #import "SignalsNavigationController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.m index 55377613e..43c3af5c5 100644 --- a/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.m @@ -5,7 +5,7 @@ #import "AddToGroupViewController.h" #import "BlockListUIUtils.h" #import "ContactsViewHelper.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m index aa4638690..6aa4b4d63 100644 --- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m @@ -5,7 +5,7 @@ #import "FingerprintViewController.h" #import "FingerprintViewScanController.h" #import "OWSBezierPathView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m index 88ddc1677..7a399fce6 100644 --- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m +++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m @@ -4,7 +4,7 @@ #import "FingerprintViewScanController.h" #import "OWSQRCodeScanningViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIColor+OWS.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index d18d868b3..108067746 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -11,7 +11,7 @@ #import "OWSSoundSettingsViewController.h" #import "PhoneNumber.h" #import "ShowGroupMembersViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "UIFont+OWS.h" #import "UIView+OWS.h" #import "UpdateGroupViewController.h" diff --git a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m index 4de3f3d24..beca2be95 100644 --- a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m @@ -3,7 +3,7 @@ // #import "ShowGroupMembersViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalApp.h" #import "ViewControllerUtils.h" #import diff --git a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m index f2624d178..68997170c 100644 --- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m @@ -6,7 +6,7 @@ #import "AddToGroupViewController.h" #import "AvatarViewHelper.h" #import "OWSNavigationController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "ViewControllerUtils.h" #import #import diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m index a84975323..05fb721ff 100644 --- a/Signal/src/environment/SignalApp.m +++ b/Signal/src/environment/SignalApp.m @@ -6,7 +6,7 @@ #import "AppDelegate.h" #import "ConversationViewController.h" #import "HomeViewController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "SignalsNavigationController.h" #import #import diff --git a/Signal/src/util/Backup/OWSBackup.m b/Signal/src/util/Backup/OWSBackup.m index c56069ded..6296da6e9 100644 --- a/Signal/src/util/Backup/OWSBackup.m +++ b/Signal/src/util/Backup/OWSBackup.m @@ -6,7 +6,7 @@ #import "OWSBackupExportJob.h" #import "OWSBackupIO.h" #import "OWSBackupImportJob.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/util/Backup/OWSBackupExportJob.m b/Signal/src/util/Backup/OWSBackupExportJob.m index bc6255bfa..a9fd24eff 100644 --- a/Signal/src/util/Backup/OWSBackupExportJob.m +++ b/Signal/src/util/Backup/OWSBackupExportJob.m @@ -5,7 +5,7 @@ #import "OWSBackupExportJob.h" #import "OWSBackupIO.h" #import "OWSDatabaseMigration.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/util/Backup/OWSBackupImportJob.m b/Signal/src/util/Backup/OWSBackupImportJob.m index 131a735df..6ccf6f5de 100644 --- a/Signal/src/util/Backup/OWSBackupImportJob.m +++ b/Signal/src/util/Backup/OWSBackupImportJob.m @@ -6,7 +6,7 @@ #import "OWSBackupIO.h" #import "OWSDatabaseMigration.h" #import "OWSDatabaseMigrationRunner.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/util/Backup/OWSBackupJob.m b/Signal/src/util/Backup/OWSBackupJob.m index 58b008bca..92aab7714 100644 --- a/Signal/src/util/Backup/OWSBackupJob.m +++ b/Signal/src/util/Backup/OWSBackupJob.m @@ -4,7 +4,7 @@ #import "OWSBackupJob.h" #import "OWSBackupIO.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m index c808a9160..bfb746148 100644 --- a/Signal/src/util/MainAppContext.m +++ b/Signal/src/util/MainAppContext.m @@ -3,7 +3,7 @@ // #import "MainAppContext.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/util/OWSScreenLockUI.m b/Signal/src/util/OWSScreenLockUI.m index 3397272ac..573bdd709 100644 --- a/Signal/src/util/OWSScreenLockUI.m +++ b/Signal/src/util/OWSScreenLockUI.m @@ -4,7 +4,7 @@ #import "OWSScreenLockUI.h" #import "OWSWindowManager.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/util/Pastelog.m b/Signal/src/util/Pastelog.m index c2077534c..24336da28 100644 --- a/Signal/src/util/Pastelog.m +++ b/Signal/src/util/Pastelog.m @@ -3,7 +3,7 @@ // #import "Pastelog.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import "ThreadUtil.h" #import "zlib.h" #import diff --git a/Signal/src/util/RegistrationUtils.m b/Signal/src/util/RegistrationUtils.m index 9a0d7b586..888d3bdec 100644 --- a/Signal/src/util/RegistrationUtils.m +++ b/Signal/src/util/RegistrationUtils.m @@ -4,7 +4,7 @@ #import "RegistrationUtils.h" #import "OWSNavigationController.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/util/UIViewController+Permissions.m b/Signal/src/util/UIViewController+Permissions.m index 955e9722e..ec9fe4884 100644 --- a/Signal/src/util/UIViewController+Permissions.m +++ b/Signal/src/util/UIViewController+Permissions.m @@ -3,7 +3,7 @@ // #import "UIViewController+Permissions.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/src/views/PinEntryView.m b/Signal/src/views/PinEntryView.m index cd027d37f..f0c251d8c 100644 --- a/Signal/src/views/PinEntryView.m +++ b/Signal/src/views/PinEntryView.m @@ -3,7 +3,7 @@ // #import "PinEntryView.h" -#import "Signal-Swift.h" +#import "Session-Swift.h" #import #import #import diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 15be147f7..bb9fe3a1d 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2550,15 +2550,16 @@ "Enter a name to be shown to your contacts" = "Enter a name to be shown to your contacts"; "Display Name (Optional)" = "Display Name (Optional)"; "Type an optional password for added security" = "Type an optional password for added security"; -"Next" = "Next"; "Password (Optional)" = "Password (Optional)"; +"Next" = "Next"; "Please save the seed below in a safe location. It can be used to restore your account if you lose access, or to migrate to a new device." = "Please save the seed below in a safe location. It can be used to restore your account if you lose access, or to migrate to a new device."; "Copy" = "Copy"; "Copied ✓" = "Copied ✓"; +"Restore Using Mnemonic" = "Restore Using Mnemonic"; "Register" = "Register"; -"Restore" = "Restore"; "Enter Your Mnemonic" = "Enter Your Mnemonic"; -"Restore Using Mnemonic" = "Restore Using Mnemonic"; +"Register a New Account" = "Register a New Account"; +"Restore" = "Restore"; "Something went wrong. Please check your mnemonic and try again." = "Something went wrong. Please check your mnemonic and try again."; "Looks like you didn't enter enough words. Please check your mnemonic and try again." = "Looks like you didn't enter enough words. Please check your mnemonic and try again."; "You seem to be missing the last word of your mnemonic. Please check what you entered and try again." = "You seem to be missing the last word of your mnemonic. Please check what you entered and try again.";