Add deprecated prefix to all existing onboarding/registration types
* Add deprecated prefix to all existing onboarding/registration types. (Will be forked to new versions later, potentially untouched) * Mark old requests deprecated
This commit is contained in:
Harry
GitHub
parent
20239403fa
commit
9a511cdda0
@ -261,8 +261,8 @@
|
||||
34386A51207D0C01009F5D9C /* ChatListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34386A4D207D0C01009F5D9C /* ChatListViewController.m */; };
|
||||
343A65951FC47D5E000477A1 /* DebugUISyncMessages.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A65941FC47D5E000477A1 /* DebugUISyncMessages.m */; };
|
||||
3440426B273AB186008C9FA4 /* RegistrationUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3440426A273AB186008C9FA4 /* RegistrationUtils.swift */; };
|
||||
34404271273AFBBE008C9FA4 /* ChangePhoneNumber2FAViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34404270273AFBBE008C9FA4 /* ChangePhoneNumber2FAViewController.swift */; };
|
||||
34404275273C0E41008C9FA4 /* RegistrationPinAttemptsExhaustedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34404274273C0E41008C9FA4 /* RegistrationPinAttemptsExhaustedViewController.swift */; };
|
||||
34404271273AFBBE008C9FA4 /* Deprecated_ChangePhoneNumber2FAViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34404270273AFBBE008C9FA4 /* Deprecated_ChangePhoneNumber2FAViewController.swift */; };
|
||||
34404275273C0E41008C9FA4 /* Deprecated_RegistrationPinAttemptsExhaustedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34404274273C0E41008C9FA4 /* Deprecated_RegistrationPinAttemptsExhaustedViewController.swift */; };
|
||||
34429B3D273440420050D3EA /* DebugUIMisc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34429B3C273440420050D3EA /* DebugUIMisc.swift */; };
|
||||
3444E6BB264EDFF300B32E3B /* CVColorOrGradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3444E6BA264EDFF200B32E3B /* CVColorOrGradientView.swift */; };
|
||||
34480B361FD0929200BC14EF /* ShareAppExtensionContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B351FD0929200BC14EF /* ShareAppExtensionContext.m */; };
|
||||
@ -488,30 +488,30 @@
|
||||
34A955B9271B553D00B05242 /* PaymentsFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A955B8271B553D00B05242 /* PaymentsFormat.swift */; };
|
||||
34A955BB271B55BA00B05242 /* PaymentsUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A955BA271B55BA00B05242 /* PaymentsUI.swift */; };
|
||||
34A955BD271B560000B05242 /* NameCollisionFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A955BC271B560000B05242 /* NameCollisionFinder.swift */; };
|
||||
34ACA7D52733159600E47AD4 /* OnboardingTransferChoiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7BC2733159600E47AD4 /* OnboardingTransferChoiceViewController.swift */; };
|
||||
34ACA7D62733159600E47AD4 /* OnboardingTransferQRCodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7BD2733159600E47AD4 /* OnboardingTransferQRCodeViewController.swift */; };
|
||||
34ACA7D72733159600E47AD4 /* OnboardingTransferProgressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7BE2733159600E47AD4 /* OnboardingTransferProgressViewController.swift */; };
|
||||
34ACA7D82733159600E47AD4 /* OnboardingModeSwitchConfirmationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C02733159600E47AD4 /* OnboardingModeSwitchConfirmationViewController.swift */; };
|
||||
34ACA7D92733159600E47AD4 /* OnboardingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C12733159600E47AD4 /* OnboardingController.swift */; };
|
||||
34ACA7DB2733159600E47AD4 /* OnboardingSplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C32733159600E47AD4 /* OnboardingSplashViewController.swift */; };
|
||||
34ACA7DC2733159600E47AD4 /* OnboardingCaptchaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C42733159600E47AD4 /* OnboardingCaptchaViewController.swift */; };
|
||||
34ACA7DD2733159600E47AD4 /* OnboardingBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C52733159600E47AD4 /* OnboardingBaseViewController.swift */; };
|
||||
34ACA7DE2733159600E47AD4 /* OnboardingPhoneNumberDiscoverabilityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C62733159600E47AD4 /* OnboardingPhoneNumberDiscoverabilityViewController.swift */; };
|
||||
34ACA7DF2733159600E47AD4 /* Onboarding2FAViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C72733159600E47AD4 /* Onboarding2FAViewController.swift */; };
|
||||
34ACA7E02733159600E47AD4 /* OnboardingVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C82733159600E47AD4 /* OnboardingVerificationViewController.swift */; };
|
||||
34ACA7E12733159600E47AD4 /* OnboardingProfileCreationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C92733159600E47AD4 /* OnboardingProfileCreationViewController.swift */; };
|
||||
34ACA7E22733159600E47AD4 /* OnboardingPhoneNumberViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7CA2733159600E47AD4 /* OnboardingPhoneNumberViewController.swift */; };
|
||||
34ACA7E42733159600E47AD4 /* OnboardingPermissionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7CC2733159600E47AD4 /* OnboardingPermissionsViewController.swift */; };
|
||||
34ACA7E52733159600E47AD4 /* ChangePhoneNumberVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7CE2733159600E47AD4 /* ChangePhoneNumberVerificationViewController.swift */; };
|
||||
34ACA7E62733159600E47AD4 /* ChangePhoneNumberInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7CF2733159600E47AD4 /* ChangePhoneNumberInputViewController.swift */; };
|
||||
34ACA7E72733159600E47AD4 /* ChangePhoneNumberConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7D02733159600E47AD4 /* ChangePhoneNumberConfirmViewController.swift */; };
|
||||
34ACA7E82733159600E47AD4 /* ChangePhoneNumberController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7D12733159600E47AD4 /* ChangePhoneNumberController.swift */; };
|
||||
34ACA7E92733159600E47AD4 /* ChangePhoneNumberSplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7D22733159600E47AD4 /* ChangePhoneNumberSplashViewController.swift */; };
|
||||
34ACA7EA2733159600E47AD4 /* ChangePhoneNumberCaptchaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7D32733159600E47AD4 /* ChangePhoneNumberCaptchaViewController.swift */; };
|
||||
34ACA7F02733161000E47AD4 /* RegistrationVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7EC2733161000E47AD4 /* RegistrationVerificationViewController.swift */; };
|
||||
34ACA7F12733161000E47AD4 /* RegistrationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7ED2733161000E47AD4 /* RegistrationHelper.swift */; };
|
||||
34ACA7F22733161000E47AD4 /* RegistrationBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7EE2733161000E47AD4 /* RegistrationBaseViewController.swift */; };
|
||||
34ACA7F32733161000E47AD4 /* RegistrationCaptchaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7EF2733161000E47AD4 /* RegistrationCaptchaViewController.swift */; };
|
||||
34ACA7D52733159600E47AD4 /* Deprecated_OnboardingTransferChoiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7BC2733159600E47AD4 /* Deprecated_OnboardingTransferChoiceViewController.swift */; };
|
||||
34ACA7D62733159600E47AD4 /* Deprecated_OnboardingTransferQRCodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7BD2733159600E47AD4 /* Deprecated_OnboardingTransferQRCodeViewController.swift */; };
|
||||
34ACA7D72733159600E47AD4 /* Deprecated_OnboardingTransferProgressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7BE2733159600E47AD4 /* Deprecated_OnboardingTransferProgressViewController.swift */; };
|
||||
34ACA7D82733159600E47AD4 /* Deprecated_OnboardingModeSwitchConfirmationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C02733159600E47AD4 /* Deprecated_OnboardingModeSwitchConfirmationViewController.swift */; };
|
||||
34ACA7D92733159600E47AD4 /* Deprecated_OnboardingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C12733159600E47AD4 /* Deprecated_OnboardingController.swift */; };
|
||||
34ACA7DB2733159600E47AD4 /* Deprecated_OnboardingSplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C32733159600E47AD4 /* Deprecated_OnboardingSplashViewController.swift */; };
|
||||
34ACA7DC2733159600E47AD4 /* Deprecated_OnboardingCaptchaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C42733159600E47AD4 /* Deprecated_OnboardingCaptchaViewController.swift */; };
|
||||
34ACA7DD2733159600E47AD4 /* Deprecated_OnboardingBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C52733159600E47AD4 /* Deprecated_OnboardingBaseViewController.swift */; };
|
||||
34ACA7DE2733159600E47AD4 /* Deprecated_RegistrationPhoneNumberDiscoverabilityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C62733159600E47AD4 /* Deprecated_RegistrationPhoneNumberDiscoverabilityViewController.swift */; };
|
||||
34ACA7DF2733159600E47AD4 /* Deprecated_Onboarding2FAViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C72733159600E47AD4 /* Deprecated_Onboarding2FAViewController.swift */; };
|
||||
34ACA7E02733159600E47AD4 /* Deprecated_OnboardingVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C82733159600E47AD4 /* Deprecated_OnboardingVerificationViewController.swift */; };
|
||||
34ACA7E12733159600E47AD4 /* Deprecated_OnboardingProfileCreationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7C92733159600E47AD4 /* Deprecated_OnboardingProfileCreationViewController.swift */; };
|
||||
34ACA7E22733159600E47AD4 /* Deprecated_RegistrationPhoneNumberViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7CA2733159600E47AD4 /* Deprecated_RegistrationPhoneNumberViewController.swift */; };
|
||||
34ACA7E42733159600E47AD4 /* Deprecated_OnboardingPermissionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7CC2733159600E47AD4 /* Deprecated_OnboardingPermissionsViewController.swift */; };
|
||||
34ACA7E52733159600E47AD4 /* Deprecated_ChangePhoneNumberVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7CE2733159600E47AD4 /* Deprecated_ChangePhoneNumberVerificationViewController.swift */; };
|
||||
34ACA7E62733159600E47AD4 /* Deprecated_ChangePhoneNumberInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7CF2733159600E47AD4 /* Deprecated_ChangePhoneNumberInputViewController.swift */; };
|
||||
34ACA7E72733159600E47AD4 /* Deprecated_ChangePhoneNumberConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7D02733159600E47AD4 /* Deprecated_ChangePhoneNumberConfirmViewController.swift */; };
|
||||
34ACA7E82733159600E47AD4 /* Deprecated_ChangePhoneNumberController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7D12733159600E47AD4 /* Deprecated_ChangePhoneNumberController.swift */; };
|
||||
34ACA7E92733159600E47AD4 /* Deprecated_ChangePhoneNumberSplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7D22733159600E47AD4 /* Deprecated_ChangePhoneNumberSplashViewController.swift */; };
|
||||
34ACA7EA2733159600E47AD4 /* Deprecated_ChangePhoneNumberCaptchaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7D32733159600E47AD4 /* Deprecated_ChangePhoneNumberCaptchaViewController.swift */; };
|
||||
34ACA7F02733161000E47AD4 /* Deprecated_RegistrationVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7EC2733161000E47AD4 /* Deprecated_RegistrationVerificationViewController.swift */; };
|
||||
34ACA7F12733161000E47AD4 /* Deprecated_RegistrationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7ED2733161000E47AD4 /* Deprecated_RegistrationHelper.swift */; };
|
||||
34ACA7F22733161000E47AD4 /* Deprecated_RegistrationBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7EE2733161000E47AD4 /* Deprecated_RegistrationBaseViewController.swift */; };
|
||||
34ACA7F32733161000E47AD4 /* Deprecated_RegistrationCaptchaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7EF2733161000E47AD4 /* Deprecated_RegistrationCaptchaViewController.swift */; };
|
||||
34ACA7F62733183000E47AD4 /* RegistrationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7F42733183000E47AD4 /* RegistrationValues.swift */; };
|
||||
34ACA7F72733183000E47AD4 /* CountryCodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ACA7F52733183000E47AD4 /* CountryCodeViewController.swift */; };
|
||||
34B0796D1FCF46B100E248C2 /* MainAppContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B0796B1FCF46B000E248C2 /* MainAppContext.m */; };
|
||||
@ -700,12 +700,12 @@
|
||||
4C21D5D8223AC60F00EF8A77 /* PhotoCapture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C21D5D7223AC60F00EF8A77 /* PhotoCapture.swift */; };
|
||||
4C25768A23AD510800E0398D /* LoadMoreMessagesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C25768923AD510800E0398D /* LoadMoreMessagesView.swift */; };
|
||||
4C2A538C23C5462300D28CD8 /* CVMessageMappingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2A538B23C5462300D28CD8 /* CVMessageMappingTest.swift */; };
|
||||
4C2EBB7F2356B2B900BBC171 /* SecondaryLinkingSetDeviceNameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2EBB7E2356B2B900BBC171 /* SecondaryLinkingSetDeviceNameViewController.swift */; };
|
||||
4C2EBB7F2356B2B900BBC171 /* Deprecated_SecondaryLinkingSetDeviceNameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2EBB7E2356B2B900BBC171 /* Deprecated_SecondaryLinkingSetDeviceNameViewController.swift */; };
|
||||
4C2F454F214C00E1004871FF /* AvatarTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */; };
|
||||
4C30E224234F9F34009558B7 /* SecondaryLinkingPrepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30E223234F9F34009558B7 /* SecondaryLinkingPrepViewController.swift */; };
|
||||
4C30E226234FB033009558B7 /* SecondaryLinkingQRCodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30E225234FB033009558B7 /* SecondaryLinkingQRCodeViewController.swift */; };
|
||||
4C30E224234F9F34009558B7 /* Deprecated_SecondaryLinkingPrepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30E223234F9F34009558B7 /* Deprecated_SecondaryLinkingPrepViewController.swift */; };
|
||||
4C30E226234FB033009558B7 /* Deprecated_SecondaryLinkingQRCodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30E225234FB033009558B7 /* Deprecated_SecondaryLinkingQRCodeViewController.swift */; };
|
||||
4C35B08A23F8A9D2003EB937 /* MessageRequestPendingReceipts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C35B08823F8A9A1003EB937 /* MessageRequestPendingReceipts.swift */; };
|
||||
4C3A2BC72356620E004B3986 /* ProvisioningController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3A2BC62356620E004B3986 /* ProvisioningController.swift */; };
|
||||
4C3A2BC72356620E004B3986 /* Deprecated_ProvisioningController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3A2BC62356620E004B3986 /* Deprecated_ProvisioningController.swift */; };
|
||||
4C3EF7FD2107DDEE0007EBF7 /* ParamParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EF7FC2107DDEE0007EBF7 /* ParamParserTest.swift */; };
|
||||
4C3EF802210918740007EBF7 /* SSKProtoEnvelopeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EF801210918740007EBF7 /* SSKProtoEnvelopeTest.swift */; };
|
||||
4C42960E2318E5EB00D9D240 /* MessageProcessingPerformanceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C42960D2318E5EB00D9D240 /* MessageProcessingPerformanceTest.swift */; };
|
||||
@ -2459,8 +2459,8 @@
|
||||
343A65931FC47D5D000477A1 /* DebugUISyncMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugUISyncMessages.h; sourceTree = "<group>"; };
|
||||
343A65941FC47D5E000477A1 /* DebugUISyncMessages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugUISyncMessages.m; sourceTree = "<group>"; };
|
||||
3440426A273AB186008C9FA4 /* RegistrationUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationUtils.swift; sourceTree = "<group>"; };
|
||||
34404270273AFBBE008C9FA4 /* ChangePhoneNumber2FAViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangePhoneNumber2FAViewController.swift; sourceTree = "<group>"; };
|
||||
34404274273C0E41008C9FA4 /* RegistrationPinAttemptsExhaustedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationPinAttemptsExhaustedViewController.swift; sourceTree = "<group>"; };
|
||||
34404270273AFBBE008C9FA4 /* Deprecated_ChangePhoneNumber2FAViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_ChangePhoneNumber2FAViewController.swift; sourceTree = "<group>"; };
|
||||
34404274273C0E41008C9FA4 /* Deprecated_RegistrationPinAttemptsExhaustedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_RegistrationPinAttemptsExhaustedViewController.swift; sourceTree = "<group>"; };
|
||||
34429B3C273440420050D3EA /* DebugUIMisc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DebugUIMisc.swift; sourceTree = "<group>"; };
|
||||
3444E6BA264EDFF200B32E3B /* CVColorOrGradientView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CVColorOrGradientView.swift; sourceTree = "<group>"; };
|
||||
34480B341FD0929200BC14EF /* ShareAppExtensionContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareAppExtensionContext.h; sourceTree = "<group>"; };
|
||||
@ -2815,30 +2815,30 @@
|
||||
34A955B8271B553D00B05242 /* PaymentsFormat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaymentsFormat.swift; sourceTree = "<group>"; };
|
||||
34A955BA271B55BA00B05242 /* PaymentsUI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaymentsUI.swift; sourceTree = "<group>"; };
|
||||
34A955BC271B560000B05242 /* NameCollisionFinder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NameCollisionFinder.swift; sourceTree = "<group>"; };
|
||||
34ACA7BC2733159600E47AD4 /* OnboardingTransferChoiceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingTransferChoiceViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7BD2733159600E47AD4 /* OnboardingTransferQRCodeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingTransferQRCodeViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7BE2733159600E47AD4 /* OnboardingTransferProgressViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingTransferProgressViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C02733159600E47AD4 /* OnboardingModeSwitchConfirmationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingModeSwitchConfirmationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C12733159600E47AD4 /* OnboardingController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C32733159600E47AD4 /* OnboardingSplashViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingSplashViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C42733159600E47AD4 /* OnboardingCaptchaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingCaptchaViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C52733159600E47AD4 /* OnboardingBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingBaseViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C62733159600E47AD4 /* OnboardingPhoneNumberDiscoverabilityViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPhoneNumberDiscoverabilityViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C72733159600E47AD4 /* Onboarding2FAViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Onboarding2FAViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C82733159600E47AD4 /* OnboardingVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingVerificationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C92733159600E47AD4 /* OnboardingProfileCreationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingProfileCreationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7CA2733159600E47AD4 /* OnboardingPhoneNumberViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPhoneNumberViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7CC2733159600E47AD4 /* OnboardingPermissionsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPermissionsViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7CE2733159600E47AD4 /* ChangePhoneNumberVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangePhoneNumberVerificationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7CF2733159600E47AD4 /* ChangePhoneNumberInputViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangePhoneNumberInputViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7D02733159600E47AD4 /* ChangePhoneNumberConfirmViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangePhoneNumberConfirmViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7D12733159600E47AD4 /* ChangePhoneNumberController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangePhoneNumberController.swift; sourceTree = "<group>"; };
|
||||
34ACA7D22733159600E47AD4 /* ChangePhoneNumberSplashViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangePhoneNumberSplashViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7D32733159600E47AD4 /* ChangePhoneNumberCaptchaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangePhoneNumberCaptchaViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7EC2733161000E47AD4 /* RegistrationVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationVerificationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7ED2733161000E47AD4 /* RegistrationHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationHelper.swift; sourceTree = "<group>"; };
|
||||
34ACA7EE2733161000E47AD4 /* RegistrationBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationBaseViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7EF2733161000E47AD4 /* RegistrationCaptchaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationCaptchaViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7BC2733159600E47AD4 /* Deprecated_OnboardingTransferChoiceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingTransferChoiceViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7BD2733159600E47AD4 /* Deprecated_OnboardingTransferQRCodeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingTransferQRCodeViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7BE2733159600E47AD4 /* Deprecated_OnboardingTransferProgressViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingTransferProgressViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C02733159600E47AD4 /* Deprecated_OnboardingModeSwitchConfirmationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingModeSwitchConfirmationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C12733159600E47AD4 /* Deprecated_OnboardingController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C32733159600E47AD4 /* Deprecated_OnboardingSplashViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingSplashViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C42733159600E47AD4 /* Deprecated_OnboardingCaptchaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingCaptchaViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C52733159600E47AD4 /* Deprecated_OnboardingBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingBaseViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C62733159600E47AD4 /* Deprecated_RegistrationPhoneNumberDiscoverabilityViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_RegistrationPhoneNumberDiscoverabilityViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C72733159600E47AD4 /* Deprecated_Onboarding2FAViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_Onboarding2FAViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C82733159600E47AD4 /* Deprecated_OnboardingVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingVerificationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7C92733159600E47AD4 /* Deprecated_OnboardingProfileCreationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingProfileCreationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7CA2733159600E47AD4 /* Deprecated_RegistrationPhoneNumberViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_RegistrationPhoneNumberViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7CC2733159600E47AD4 /* Deprecated_OnboardingPermissionsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_OnboardingPermissionsViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7CE2733159600E47AD4 /* Deprecated_ChangePhoneNumberVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_ChangePhoneNumberVerificationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7CF2733159600E47AD4 /* Deprecated_ChangePhoneNumberInputViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_ChangePhoneNumberInputViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7D02733159600E47AD4 /* Deprecated_ChangePhoneNumberConfirmViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_ChangePhoneNumberConfirmViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7D12733159600E47AD4 /* Deprecated_ChangePhoneNumberController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_ChangePhoneNumberController.swift; sourceTree = "<group>"; };
|
||||
34ACA7D22733159600E47AD4 /* Deprecated_ChangePhoneNumberSplashViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_ChangePhoneNumberSplashViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7D32733159600E47AD4 /* Deprecated_ChangePhoneNumberCaptchaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_ChangePhoneNumberCaptchaViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7EC2733161000E47AD4 /* Deprecated_RegistrationVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_RegistrationVerificationViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7ED2733161000E47AD4 /* Deprecated_RegistrationHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_RegistrationHelper.swift; sourceTree = "<group>"; };
|
||||
34ACA7EE2733161000E47AD4 /* Deprecated_RegistrationBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_RegistrationBaseViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7EF2733161000E47AD4 /* Deprecated_RegistrationCaptchaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deprecated_RegistrationCaptchaViewController.swift; sourceTree = "<group>"; };
|
||||
34ACA7F42733183000E47AD4 /* RegistrationValues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationValues.swift; sourceTree = "<group>"; };
|
||||
34ACA7F52733183000E47AD4 /* CountryCodeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CountryCodeViewController.swift; sourceTree = "<group>"; };
|
||||
34B0796B1FCF46B000E248C2 /* MainAppContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainAppContext.m; sourceTree = "<group>"; };
|
||||
@ -3047,12 +3047,12 @@
|
||||
4C21D5D7223AC60F00EF8A77 /* PhotoCapture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoCapture.swift; sourceTree = "<group>"; };
|
||||
4C25768923AD510800E0398D /* LoadMoreMessagesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadMoreMessagesView.swift; sourceTree = "<group>"; };
|
||||
4C2A538B23C5462300D28CD8 /* CVMessageMappingTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CVMessageMappingTest.swift; sourceTree = "<group>"; };
|
||||
4C2EBB7E2356B2B900BBC171 /* SecondaryLinkingSetDeviceNameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondaryLinkingSetDeviceNameViewController.swift; sourceTree = "<group>"; };
|
||||
4C2EBB7E2356B2B900BBC171 /* Deprecated_SecondaryLinkingSetDeviceNameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Deprecated_SecondaryLinkingSetDeviceNameViewController.swift; sourceTree = "<group>"; };
|
||||
4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarTableViewCell.swift; sourceTree = "<group>"; };
|
||||
4C30E223234F9F34009558B7 /* SecondaryLinkingPrepViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondaryLinkingPrepViewController.swift; sourceTree = "<group>"; };
|
||||
4C30E225234FB033009558B7 /* SecondaryLinkingQRCodeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondaryLinkingQRCodeViewController.swift; sourceTree = "<group>"; };
|
||||
4C30E223234F9F34009558B7 /* Deprecated_SecondaryLinkingPrepViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Deprecated_SecondaryLinkingPrepViewController.swift; sourceTree = "<group>"; };
|
||||
4C30E225234FB033009558B7 /* Deprecated_SecondaryLinkingQRCodeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Deprecated_SecondaryLinkingQRCodeViewController.swift; sourceTree = "<group>"; };
|
||||
4C35B08823F8A9A1003EB937 /* MessageRequestPendingReceipts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageRequestPendingReceipts.swift; sourceTree = "<group>"; };
|
||||
4C3A2BC62356620E004B3986 /* ProvisioningController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProvisioningController.swift; sourceTree = "<group>"; };
|
||||
4C3A2BC62356620E004B3986 /* Deprecated_ProvisioningController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Deprecated_ProvisioningController.swift; sourceTree = "<group>"; };
|
||||
4C3EF7FC2107DDEE0007EBF7 /* ParamParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParamParserTest.swift; sourceTree = "<group>"; };
|
||||
4C3EF801210918740007EBF7 /* SSKProtoEnvelopeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSKProtoEnvelopeTest.swift; sourceTree = "<group>"; };
|
||||
4C42960D2318E5EB00D9D240 /* MessageProcessingPerformanceTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageProcessingPerformanceTest.swift; sourceTree = "<group>"; };
|
||||
@ -4848,11 +4848,11 @@
|
||||
34ACA7BB2733159600E47AD4 /* DeviceTransfer */,
|
||||
34ACA7BF2733159600E47AD4 /* Onboarding */,
|
||||
4C3A2BC5235661AB004B3986 /* SecondaryLinking */,
|
||||
34ACA7EE2733161000E47AD4 /* RegistrationBaseViewController.swift */,
|
||||
34ACA7EF2733161000E47AD4 /* RegistrationCaptchaViewController.swift */,
|
||||
34ACA7ED2733161000E47AD4 /* RegistrationHelper.swift */,
|
||||
34404274273C0E41008C9FA4 /* RegistrationPinAttemptsExhaustedViewController.swift */,
|
||||
34ACA7EC2733161000E47AD4 /* RegistrationVerificationViewController.swift */,
|
||||
34ACA7EE2733161000E47AD4 /* Deprecated_RegistrationBaseViewController.swift */,
|
||||
34ACA7EF2733161000E47AD4 /* Deprecated_RegistrationCaptchaViewController.swift */,
|
||||
34ACA7ED2733161000E47AD4 /* Deprecated_RegistrationHelper.swift */,
|
||||
34404274273C0E41008C9FA4 /* Deprecated_RegistrationPinAttemptsExhaustedViewController.swift */,
|
||||
34ACA7EC2733161000E47AD4 /* Deprecated_RegistrationVerificationViewController.swift */,
|
||||
);
|
||||
path = Registration;
|
||||
sourceTree = "<group>";
|
||||
@ -5701,9 +5701,9 @@
|
||||
34ACA7BB2733159600E47AD4 /* DeviceTransfer */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
34ACA7BC2733159600E47AD4 /* OnboardingTransferChoiceViewController.swift */,
|
||||
34ACA7BE2733159600E47AD4 /* OnboardingTransferProgressViewController.swift */,
|
||||
34ACA7BD2733159600E47AD4 /* OnboardingTransferQRCodeViewController.swift */,
|
||||
34ACA7BC2733159600E47AD4 /* Deprecated_OnboardingTransferChoiceViewController.swift */,
|
||||
34ACA7BE2733159600E47AD4 /* Deprecated_OnboardingTransferProgressViewController.swift */,
|
||||
34ACA7BD2733159600E47AD4 /* Deprecated_OnboardingTransferQRCodeViewController.swift */,
|
||||
);
|
||||
path = DeviceTransfer;
|
||||
sourceTree = "<group>";
|
||||
@ -5711,17 +5711,17 @@
|
||||
34ACA7BF2733159600E47AD4 /* Onboarding */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
34ACA7C72733159600E47AD4 /* Onboarding2FAViewController.swift */,
|
||||
34ACA7C52733159600E47AD4 /* OnboardingBaseViewController.swift */,
|
||||
34ACA7C42733159600E47AD4 /* OnboardingCaptchaViewController.swift */,
|
||||
34ACA7C12733159600E47AD4 /* OnboardingController.swift */,
|
||||
34ACA7C02733159600E47AD4 /* OnboardingModeSwitchConfirmationViewController.swift */,
|
||||
34ACA7CC2733159600E47AD4 /* OnboardingPermissionsViewController.swift */,
|
||||
34ACA7C62733159600E47AD4 /* OnboardingPhoneNumberDiscoverabilityViewController.swift */,
|
||||
34ACA7CA2733159600E47AD4 /* OnboardingPhoneNumberViewController.swift */,
|
||||
34ACA7C92733159600E47AD4 /* OnboardingProfileCreationViewController.swift */,
|
||||
34ACA7C32733159600E47AD4 /* OnboardingSplashViewController.swift */,
|
||||
34ACA7C82733159600E47AD4 /* OnboardingVerificationViewController.swift */,
|
||||
34ACA7C72733159600E47AD4 /* Deprecated_Onboarding2FAViewController.swift */,
|
||||
34ACA7C52733159600E47AD4 /* Deprecated_OnboardingBaseViewController.swift */,
|
||||
34ACA7C42733159600E47AD4 /* Deprecated_OnboardingCaptchaViewController.swift */,
|
||||
34ACA7C12733159600E47AD4 /* Deprecated_OnboardingController.swift */,
|
||||
34ACA7C02733159600E47AD4 /* Deprecated_OnboardingModeSwitchConfirmationViewController.swift */,
|
||||
34ACA7CC2733159600E47AD4 /* Deprecated_OnboardingPermissionsViewController.swift */,
|
||||
34ACA7C92733159600E47AD4 /* Deprecated_OnboardingProfileCreationViewController.swift */,
|
||||
34ACA7C32733159600E47AD4 /* Deprecated_OnboardingSplashViewController.swift */,
|
||||
34ACA7C82733159600E47AD4 /* Deprecated_OnboardingVerificationViewController.swift */,
|
||||
34ACA7C62733159600E47AD4 /* Deprecated_RegistrationPhoneNumberDiscoverabilityViewController.swift */,
|
||||
34ACA7CA2733159600E47AD4 /* Deprecated_RegistrationPhoneNumberViewController.swift */,
|
||||
);
|
||||
path = Onboarding;
|
||||
sourceTree = "<group>";
|
||||
@ -5729,13 +5729,13 @@
|
||||
34ACA7CD2733159600E47AD4 /* ChangePhoneNumber */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
34404270273AFBBE008C9FA4 /* ChangePhoneNumber2FAViewController.swift */,
|
||||
34ACA7D32733159600E47AD4 /* ChangePhoneNumberCaptchaViewController.swift */,
|
||||
34ACA7D02733159600E47AD4 /* ChangePhoneNumberConfirmViewController.swift */,
|
||||
34ACA7D12733159600E47AD4 /* ChangePhoneNumberController.swift */,
|
||||
34ACA7CF2733159600E47AD4 /* ChangePhoneNumberInputViewController.swift */,
|
||||
34ACA7D22733159600E47AD4 /* ChangePhoneNumberSplashViewController.swift */,
|
||||
34ACA7CE2733159600E47AD4 /* ChangePhoneNumberVerificationViewController.swift */,
|
||||
34404270273AFBBE008C9FA4 /* Deprecated_ChangePhoneNumber2FAViewController.swift */,
|
||||
34ACA7D32733159600E47AD4 /* Deprecated_ChangePhoneNumberCaptchaViewController.swift */,
|
||||
34ACA7D02733159600E47AD4 /* Deprecated_ChangePhoneNumberConfirmViewController.swift */,
|
||||
34ACA7D12733159600E47AD4 /* Deprecated_ChangePhoneNumberController.swift */,
|
||||
34ACA7CF2733159600E47AD4 /* Deprecated_ChangePhoneNumberInputViewController.swift */,
|
||||
34ACA7D22733159600E47AD4 /* Deprecated_ChangePhoneNumberSplashViewController.swift */,
|
||||
34ACA7CE2733159600E47AD4 /* Deprecated_ChangePhoneNumberVerificationViewController.swift */,
|
||||
);
|
||||
path = ChangePhoneNumber;
|
||||
sourceTree = "<group>";
|
||||
@ -6085,10 +6085,10 @@
|
||||
4C3A2BC5235661AB004B3986 /* SecondaryLinking */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
4C3A2BC62356620E004B3986 /* ProvisioningController.swift */,
|
||||
4C30E223234F9F34009558B7 /* SecondaryLinkingPrepViewController.swift */,
|
||||
4C30E225234FB033009558B7 /* SecondaryLinkingQRCodeViewController.swift */,
|
||||
4C2EBB7E2356B2B900BBC171 /* SecondaryLinkingSetDeviceNameViewController.swift */,
|
||||
4C3A2BC62356620E004B3986 /* Deprecated_ProvisioningController.swift */,
|
||||
4C30E223234F9F34009558B7 /* Deprecated_SecondaryLinkingPrepViewController.swift */,
|
||||
4C30E225234FB033009558B7 /* Deprecated_SecondaryLinkingQRCodeViewController.swift */,
|
||||
4C2EBB7E2356B2B900BBC171 /* Deprecated_SecondaryLinkingSetDeviceNameViewController.swift */,
|
||||
);
|
||||
path = SecondaryLinking;
|
||||
sourceTree = "<group>";
|
||||
@ -10520,13 +10520,6 @@
|
||||
88D23D2623CEC0C700B0E74B /* CallUIAdapter.swift in Sources */,
|
||||
4C46361122EB98EC00185951 /* CameraFirstCaptureSendFlow.swift in Sources */,
|
||||
4CA46F4C219CCC630038ABDE /* CaptionView.swift in Sources */,
|
||||
34404271273AFBBE008C9FA4 /* ChangePhoneNumber2FAViewController.swift in Sources */,
|
||||
34ACA7EA2733159600E47AD4 /* ChangePhoneNumberCaptchaViewController.swift in Sources */,
|
||||
34ACA7E72733159600E47AD4 /* ChangePhoneNumberConfirmViewController.swift in Sources */,
|
||||
34ACA7E82733159600E47AD4 /* ChangePhoneNumberController.swift in Sources */,
|
||||
34ACA7E62733159600E47AD4 /* ChangePhoneNumberInputViewController.swift in Sources */,
|
||||
34ACA7E92733159600E47AD4 /* ChangePhoneNumberSplashViewController.swift in Sources */,
|
||||
34ACA7E52733159600E47AD4 /* ChangePhoneNumberVerificationViewController.swift in Sources */,
|
||||
34546F502649989D007C4958 /* ChatColorViewController.swift in Sources */,
|
||||
346E09012662FBBE0042375E /* ChatListCell.swift in Sources */,
|
||||
34E95C27269F6096004807EC /* ChatListViewController+Actions.swift in Sources */,
|
||||
@ -10695,6 +10688,36 @@
|
||||
66B8B28028C94C0F005EAFE0 /* DelegatingContextMenuButton.swift in Sources */,
|
||||
887B6DC925F6C3E900E677D4 /* DeleteAccountConfirmationViewController.swift in Sources */,
|
||||
3498AC892513896400B1F315 /* Dependencies+MainApp.swift in Sources */,
|
||||
34404271273AFBBE008C9FA4 /* Deprecated_ChangePhoneNumber2FAViewController.swift in Sources */,
|
||||
34ACA7EA2733159600E47AD4 /* Deprecated_ChangePhoneNumberCaptchaViewController.swift in Sources */,
|
||||
34ACA7E72733159600E47AD4 /* Deprecated_ChangePhoneNumberConfirmViewController.swift in Sources */,
|
||||
34ACA7E82733159600E47AD4 /* Deprecated_ChangePhoneNumberController.swift in Sources */,
|
||||
34ACA7E62733159600E47AD4 /* Deprecated_ChangePhoneNumberInputViewController.swift in Sources */,
|
||||
34ACA7E92733159600E47AD4 /* Deprecated_ChangePhoneNumberSplashViewController.swift in Sources */,
|
||||
34ACA7E52733159600E47AD4 /* Deprecated_ChangePhoneNumberVerificationViewController.swift in Sources */,
|
||||
34ACA7DF2733159600E47AD4 /* Deprecated_Onboarding2FAViewController.swift in Sources */,
|
||||
34ACA7DD2733159600E47AD4 /* Deprecated_OnboardingBaseViewController.swift in Sources */,
|
||||
34ACA7DC2733159600E47AD4 /* Deprecated_OnboardingCaptchaViewController.swift in Sources */,
|
||||
34ACA7D92733159600E47AD4 /* Deprecated_OnboardingController.swift in Sources */,
|
||||
34ACA7D82733159600E47AD4 /* Deprecated_OnboardingModeSwitchConfirmationViewController.swift in Sources */,
|
||||
34ACA7E42733159600E47AD4 /* Deprecated_OnboardingPermissionsViewController.swift in Sources */,
|
||||
34ACA7E12733159600E47AD4 /* Deprecated_OnboardingProfileCreationViewController.swift in Sources */,
|
||||
34ACA7DB2733159600E47AD4 /* Deprecated_OnboardingSplashViewController.swift in Sources */,
|
||||
34ACA7D52733159600E47AD4 /* Deprecated_OnboardingTransferChoiceViewController.swift in Sources */,
|
||||
34ACA7D72733159600E47AD4 /* Deprecated_OnboardingTransferProgressViewController.swift in Sources */,
|
||||
34ACA7D62733159600E47AD4 /* Deprecated_OnboardingTransferQRCodeViewController.swift in Sources */,
|
||||
34ACA7E02733159600E47AD4 /* Deprecated_OnboardingVerificationViewController.swift in Sources */,
|
||||
4C3A2BC72356620E004B3986 /* Deprecated_ProvisioningController.swift in Sources */,
|
||||
34ACA7F22733161000E47AD4 /* Deprecated_RegistrationBaseViewController.swift in Sources */,
|
||||
34ACA7F32733161000E47AD4 /* Deprecated_RegistrationCaptchaViewController.swift in Sources */,
|
||||
34ACA7F12733161000E47AD4 /* Deprecated_RegistrationHelper.swift in Sources */,
|
||||
34ACA7DE2733159600E47AD4 /* Deprecated_RegistrationPhoneNumberDiscoverabilityViewController.swift in Sources */,
|
||||
34ACA7E22733159600E47AD4 /* Deprecated_RegistrationPhoneNumberViewController.swift in Sources */,
|
||||
34404275273C0E41008C9FA4 /* Deprecated_RegistrationPinAttemptsExhaustedViewController.swift in Sources */,
|
||||
34ACA7F02733161000E47AD4 /* Deprecated_RegistrationVerificationViewController.swift in Sources */,
|
||||
4C30E224234F9F34009558B7 /* Deprecated_SecondaryLinkingPrepViewController.swift in Sources */,
|
||||
4C30E226234FB033009558B7 /* Deprecated_SecondaryLinkingQRCodeViewController.swift in Sources */,
|
||||
4C2EBB7F2356B2B900BBC171 /* Deprecated_SecondaryLinkingSetDeviceNameViewController.swift in Sources */,
|
||||
5011D1CD29400E7300064098 /* DeviceProvisioningURL.swift in Sources */,
|
||||
88A4CC19246CE6810082211F /* DeviceTransferInitialViewController.swift in Sources */,
|
||||
88A4CC17246CE6190082211F /* DeviceTransferNavigationController.swift in Sources */,
|
||||
@ -10851,20 +10874,6 @@
|
||||
887B380D25F042BE00685845 /* NotificationSettingsContentViewController.swift in Sources */,
|
||||
887B380F25F056FD00685845 /* NotificationSettingsSoundViewController.swift in Sources */,
|
||||
887B380A25F0427F00685845 /* NotificationSettingsViewController.swift in Sources */,
|
||||
34ACA7DF2733159600E47AD4 /* Onboarding2FAViewController.swift in Sources */,
|
||||
34ACA7DD2733159600E47AD4 /* OnboardingBaseViewController.swift in Sources */,
|
||||
34ACA7DC2733159600E47AD4 /* OnboardingCaptchaViewController.swift in Sources */,
|
||||
34ACA7D92733159600E47AD4 /* OnboardingController.swift in Sources */,
|
||||
34ACA7D82733159600E47AD4 /* OnboardingModeSwitchConfirmationViewController.swift in Sources */,
|
||||
34ACA7E42733159600E47AD4 /* OnboardingPermissionsViewController.swift in Sources */,
|
||||
34ACA7DE2733159600E47AD4 /* OnboardingPhoneNumberDiscoverabilityViewController.swift in Sources */,
|
||||
34ACA7E22733159600E47AD4 /* OnboardingPhoneNumberViewController.swift in Sources */,
|
||||
34ACA7E12733159600E47AD4 /* OnboardingProfileCreationViewController.swift in Sources */,
|
||||
34ACA7DB2733159600E47AD4 /* OnboardingSplashViewController.swift in Sources */,
|
||||
34ACA7D52733159600E47AD4 /* OnboardingTransferChoiceViewController.swift in Sources */,
|
||||
34ACA7D72733159600E47AD4 /* OnboardingTransferProgressViewController.swift in Sources */,
|
||||
34ACA7D62733159600E47AD4 /* OnboardingTransferQRCodeViewController.swift in Sources */,
|
||||
34ACA7E02733159600E47AD4 /* OnboardingVerificationViewController.swift in Sources */,
|
||||
F9CA468828FF0CA600C074F6 /* OneTimeDonationCustomAmountTextField.swift in Sources */,
|
||||
AC12B86D0DA4943DF1DE9CE6 /* OWSAddToContactViewController.swift in Sources */,
|
||||
34D99C931F2937CC00D284D6 /* OWSAnalytics.swift in Sources */,
|
||||
@ -10916,7 +10925,6 @@
|
||||
34798A8725AF965300EC89B4 /* ProfileBioViewController.swift in Sources */,
|
||||
8871B17125F0139D00D4E070 /* ProfileNameViewController.swift in Sources */,
|
||||
8871B16F25F007DE00D4E070 /* ProfileSettingsViewController.swift in Sources */,
|
||||
4C3A2BC72356620E004B3986 /* ProvisioningController.swift in Sources */,
|
||||
888CC15928E3CE8100A13493 /* ProxyConnectionChecker.swift in Sources */,
|
||||
88DF81A128E1538000F8BA80 /* ProxyLinkSheetViewController.swift in Sources */,
|
||||
88DF81A328E15D1600F8BA80 /* ProxySettingsViewController.swift in Sources */,
|
||||
@ -10927,22 +10935,14 @@
|
||||
88863A56280CD04B00977F69 /* ReactionFlybyAnimation.swift in Sources */,
|
||||
88B688B0238F0D1000286F82 /* ReactionsDetailSheet.swift in Sources */,
|
||||
8809CE8A22F93C2200D38867 /* RecentPhotoCollectionView.swift in Sources */,
|
||||
34ACA7F22733161000E47AD4 /* RegistrationBaseViewController.swift in Sources */,
|
||||
34ACA7F32733161000E47AD4 /* RegistrationCaptchaViewController.swift in Sources */,
|
||||
34ACA7F12733161000E47AD4 /* RegistrationHelper.swift in Sources */,
|
||||
34404275273C0E41008C9FA4 /* RegistrationPinAttemptsExhaustedViewController.swift in Sources */,
|
||||
34E5DC8220D8050D00C08145 /* RegistrationUtils.m in Sources */,
|
||||
3440426B273AB186008C9FA4 /* RegistrationUtils.swift in Sources */,
|
||||
34ACA7F02733161000E47AD4 /* RegistrationVerificationViewController.swift in Sources */,
|
||||
D997FA7628F8E3A2003C7B8B /* RemoteMegaphone.swift in Sources */,
|
||||
450D19131F85236600970622 /* RemoteVideoView.m in Sources */,
|
||||
348433DF243CA94600C7F64A /* ReplaceAdminViewController.swift in Sources */,
|
||||
342FFE7E271EF5B2000AC89F /* ReturnToCallViewController.swift in Sources */,
|
||||
348EE28F25B897BF00814FC2 /* ReusableMediaView.swift in Sources */,
|
||||
66A22C0928A18D49007CD4F5 /* RingerSwitch.swift in Sources */,
|
||||
4C30E224234F9F34009558B7 /* SecondaryLinkingPrepViewController.swift in Sources */,
|
||||
4C30E226234FB033009558B7 /* SecondaryLinkingQRCodeViewController.swift in Sources */,
|
||||
4C2EBB7F2356B2B900BBC171 /* SecondaryLinkingSetDeviceNameViewController.swift in Sources */,
|
||||
88C659B024688335002AC115 /* SelfSignedIdentity.swift in Sources */,
|
||||
4C4AE6A1224AF35700D4AF6F /* SendMediaNavigationController.swift in Sources */,
|
||||
346EAA1225013CDF00E8AB6F /* SendMessageFlow.swift in Sources */,
|
||||
|
||||
@ -35,8 +35,8 @@ public class AccountManager: NSObject {
|
||||
|
||||
// MARK: registration
|
||||
|
||||
func requestRegistrationVerification(e164: String, captchaToken: String?, isSMS: Bool) -> Promise<Void> {
|
||||
requestAccountVerification(e164: e164,
|
||||
func deprecated_requestRegistrationVerification(e164: String, captchaToken: String?, isSMS: Bool) -> Promise<Void> {
|
||||
deprecated_requestAccountVerification(e164: e164,
|
||||
captchaToken: captchaToken,
|
||||
isSMS: isSMS,
|
||||
mode: .registration)
|
||||
@ -47,10 +47,10 @@ public class AccountManager: NSObject {
|
||||
case changePhoneNumber
|
||||
}
|
||||
|
||||
public func requestAccountVerification(e164: String,
|
||||
captchaToken: String?,
|
||||
isSMS: Bool,
|
||||
mode: VerificationMode) -> Promise<Void> {
|
||||
public func deprecated_requestAccountVerification(e164: String,
|
||||
captchaToken: String?,
|
||||
isSMS: Bool,
|
||||
mode: VerificationMode) -> Promise<Void> {
|
||||
let transport: TSVerificationTransport = isSMS ? .SMS : .voice
|
||||
|
||||
return firstly { () -> Promise<String?> in
|
||||
@ -67,23 +67,23 @@ public class AccountManager: NSObject {
|
||||
break
|
||||
}
|
||||
|
||||
return self.getPreauthChallenge(e164: e164)
|
||||
return self.deprecated_getPreauthChallenge(e164: e164)
|
||||
}.then { (preauthChallenge: String?) -> Promise<Void> in
|
||||
self.accountServiceClient.requestVerificationCode(e164: e164,
|
||||
preauthChallenge: preauthChallenge,
|
||||
captchaToken: captchaToken,
|
||||
transport: transport)
|
||||
self.accountServiceClient.deprecated_requestVerificationCode(e164: e164,
|
||||
preauthChallenge: preauthChallenge,
|
||||
captchaToken: captchaToken,
|
||||
transport: transport)
|
||||
}
|
||||
}
|
||||
|
||||
func getPreauthChallenge(e164: String) -> Promise<String?> {
|
||||
func deprecated_getPreauthChallenge(e164: String) -> Promise<String?> {
|
||||
return firstly {
|
||||
return self.pushRegistrationManager.requestPushTokens(forceRotation: false)
|
||||
}.then { (vanillaToken: String, voipToken: String?) -> Promise<String?> in
|
||||
let (pushPromise, pushFuture) = Promise<String>.pending()
|
||||
self.pushRegistrationManager.preauthChallengeFuture = pushFuture
|
||||
|
||||
return self.accountServiceClient.requestPreauthChallenge(
|
||||
return self.accountServiceClient.deprecated_requestPreauthChallenge(
|
||||
e164: e164,
|
||||
pushToken: voipToken?.nilIfEmpty ?? vanillaToken,
|
||||
isVoipToken: !voipToken.isEmptyOrNil
|
||||
|
||||
@ -220,7 +220,7 @@ class AccountSettingsViewController: OWSTableViewController2 {
|
||||
}
|
||||
|
||||
private func changePhoneNumber() {
|
||||
let changePhoneNumberController = ChangePhoneNumberController(delegate: self)
|
||||
let changePhoneNumberController = Deprecated_ChangePhoneNumberController(delegate: self)
|
||||
let vc = changePhoneNumberController.firstViewController()
|
||||
navigationController?.pushViewController(vc, animated: true)
|
||||
}
|
||||
@ -361,6 +361,6 @@ class AccountSettingsViewController: OWSTableViewController2 {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension AccountSettingsViewController: ChangePhoneNumberViewDelegate {
|
||||
extension AccountSettingsViewController: Deprecated_ChangePhoneNumberViewDelegate {
|
||||
var changePhoneNumberViewFromViewController: UIViewController { self }
|
||||
}
|
||||
|
||||
@ -268,7 +268,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
[Environment.shared.preferences unsetRecordedAPNSTokens];
|
||||
|
||||
[SignalApp.shared showOnboardingView:[OnboardingController new]];
|
||||
[SignalApp.shared showOnboardingView:[Deprecated_OnboardingController new]];
|
||||
}
|
||||
|
||||
+ (void)clearHasDismissedOffers
|
||||
|
||||
@ -332,7 +332,7 @@ public class PinSetupViewController: OWSViewController, OWSNavigationChildContro
|
||||
bottomSpacer,
|
||||
pinTypeToggle,
|
||||
pinToggleSpacer,
|
||||
OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton),
|
||||
Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton),
|
||||
buttonSpacer
|
||||
])
|
||||
stackView.axis = .vertical
|
||||
|
||||
@ -9,7 +9,7 @@ import SignalMessaging
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
public class ChangePhoneNumber2FAViewController: RegistrationBaseViewController {
|
||||
public class Deprecated_ChangePhoneNumber2FAViewController: Deprecated_RegistrationBaseViewController {
|
||||
|
||||
// When the users attempts remaining falls below this number,
|
||||
// we will show an alert with more detail about the risks.
|
||||
@ -56,13 +56,13 @@ public class ChangePhoneNumber2FAViewController: RegistrationBaseViewController
|
||||
}
|
||||
|
||||
private let context: ViewControllerContext
|
||||
private let changePhoneNumberController: ChangePhoneNumberController
|
||||
private let changePhoneNumberController: Deprecated_ChangePhoneNumberController
|
||||
private let oldPhoneNumber: PhoneNumber
|
||||
private let newPhoneNumber: PhoneNumber
|
||||
private let kbsAuth: KBSAuthCredential
|
||||
|
||||
init(
|
||||
changePhoneNumberController: ChangePhoneNumberController,
|
||||
changePhoneNumberController: Deprecated_ChangePhoneNumberController,
|
||||
oldPhoneNumber: PhoneNumber,
|
||||
newPhoneNumber: PhoneNumber,
|
||||
kbsAuth: KBSAuthCredential
|
||||
@ -139,7 +139,7 @@ public class ChangePhoneNumber2FAViewController: RegistrationBaseViewController
|
||||
pinTypeToggle.accessibilityIdentifier = "onboarding.2fa." + "pinTypeToggle"
|
||||
|
||||
nextButton.accessibilityIdentifier = "onboarding.2fa." + "nextButton"
|
||||
let primaryButtonView = OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
let primaryButtonView = Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
|
||||
let topSpacer = UIView.vStretchingSpacer()
|
||||
let bottomSpacer = UIView.vStretchingSpacer()
|
||||
@ -325,7 +325,7 @@ public class ChangePhoneNumber2FAViewController: RegistrationBaseViewController
|
||||
}
|
||||
}
|
||||
|
||||
private typealias VerificationOutcome = ChangePhoneNumberController.VerificationOutcome
|
||||
private typealias VerificationOutcome = Deprecated_ChangePhoneNumberController.VerificationOutcome
|
||||
|
||||
private func getRegistrationLockTokenAndVerify(pin: String) -> Promise<VerificationOutcome> {
|
||||
firstly {
|
||||
@ -378,7 +378,7 @@ public class ChangePhoneNumber2FAViewController: RegistrationBaseViewController
|
||||
return
|
||||
}
|
||||
|
||||
let vc = RegistrationPinAttemptsExhaustedViewController(delegate: changePhoneNumberController)
|
||||
let vc = Deprecated_RegistrationPinAttemptsExhaustedViewController(delegate: changePhoneNumberController)
|
||||
navigationController.pushViewController(vc, animated: true)
|
||||
}
|
||||
|
||||
@ -459,7 +459,7 @@ public class ChangePhoneNumber2FAViewController: RegistrationBaseViewController
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension ChangePhoneNumber2FAViewController: UITextFieldDelegate {
|
||||
extension Deprecated_ChangePhoneNumber2FAViewController: UITextFieldDelegate {
|
||||
public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
|
||||
let hasPendingChanges: Bool
|
||||
if pinType == .numeric {
|
||||
@ -7,15 +7,15 @@ import SignalCoreKit
|
||||
|
||||
// Most of the logic for the verification views resides in RegistrationCaptchaViewController.
|
||||
@objc
|
||||
public class ChangePhoneNumberCaptchaViewController: RegistrationBaseViewController {
|
||||
public class Deprecated_ChangePhoneNumberCaptchaViewController: Deprecated_RegistrationBaseViewController {
|
||||
|
||||
private let changePhoneNumberController: ChangePhoneNumberController
|
||||
private let changePhoneNumberController: Deprecated_ChangePhoneNumberController
|
||||
private let oldPhoneNumber: PhoneNumber
|
||||
private let newPhoneNumber: PhoneNumber
|
||||
|
||||
let viewModel = RegistrationCaptchaViewModel()
|
||||
let viewModel = Deprecated_RegistrationCaptchaViewModel()
|
||||
|
||||
init(changePhoneNumberController: ChangePhoneNumberController,
|
||||
init(changePhoneNumberController: Deprecated_ChangePhoneNumberController,
|
||||
oldPhoneNumber: PhoneNumber,
|
||||
newPhoneNumber: PhoneNumber) {
|
||||
self.changePhoneNumberController = changePhoneNumberController
|
||||
@ -44,7 +44,7 @@ public class ChangePhoneNumberCaptchaViewController: RegistrationBaseViewControl
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension ChangePhoneNumberCaptchaViewController: RegistrationCaptchaViewController {
|
||||
extension Deprecated_ChangePhoneNumberCaptchaViewController: Deprecated_RegistrationCaptchaViewController {
|
||||
|
||||
func requestCaptchaVerification(captchaToken: String) {
|
||||
AssertIsOnMainThread()
|
||||
@ -9,15 +9,15 @@ import UIKit
|
||||
import SignalMessaging
|
||||
import SignalUI
|
||||
|
||||
class ChangePhoneNumberConfirmViewController: OWSViewController {
|
||||
class Deprecated_ChangePhoneNumberConfirmViewController: OWSViewController {
|
||||
|
||||
private let changePhoneNumberController: ChangePhoneNumberController
|
||||
private let changePhoneNumberController: Deprecated_ChangePhoneNumberController
|
||||
private let oldPhoneNumber: PhoneNumber
|
||||
private let newPhoneNumber: PhoneNumber
|
||||
|
||||
private let rootView = UIStackView()
|
||||
|
||||
public init(changePhoneNumberController: ChangePhoneNumberController,
|
||||
public init(changePhoneNumberController: Deprecated_ChangePhoneNumberController,
|
||||
oldPhoneNumber: PhoneNumber,
|
||||
newPhoneNumber: PhoneNumber) {
|
||||
self.changePhoneNumberController = changePhoneNumberController
|
||||
@ -9,16 +9,16 @@ import UIKit
|
||||
import SignalMessaging
|
||||
import SignalUI
|
||||
|
||||
protocol ChangePhoneNumberViewDelegate: AnyObject {
|
||||
protocol Deprecated_ChangePhoneNumberViewDelegate: AnyObject {
|
||||
var changePhoneNumberViewFromViewController: UIViewController { get }
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
class ChangePhoneNumberController: Dependencies {
|
||||
public weak var delegate: ChangePhoneNumberViewDelegate?
|
||||
class Deprecated_ChangePhoneNumberController: Dependencies {
|
||||
public weak var delegate: Deprecated_ChangePhoneNumberViewDelegate?
|
||||
|
||||
public init(delegate: ChangePhoneNumberViewDelegate) {
|
||||
public init(delegate: Deprecated_ChangePhoneNumberViewDelegate) {
|
||||
self.delegate = delegate
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ class ChangePhoneNumberController: Dependencies {
|
||||
|
||||
public func requestVerification(fromViewController: UIViewController,
|
||||
isSMS: Bool,
|
||||
completion: RegistrationHelper.VerificationCompletion?) {
|
||||
completion: Deprecated_RegistrationHelper.VerificationCompletion?) {
|
||||
AssertIsOnMainThread()
|
||||
|
||||
let countryState = self.newCountryState
|
||||
@ -55,7 +55,7 @@ class ChangePhoneNumberController: Dependencies {
|
||||
return
|
||||
}
|
||||
|
||||
RegistrationHelper.requestChangePhoneNumberVerification(delegate: self,
|
||||
Deprecated_RegistrationHelper.requestChangePhoneNumberVerification(delegate: self,
|
||||
fromViewController: fromViewController,
|
||||
phoneNumber: phoneNumber,
|
||||
countryState: countryState,
|
||||
@ -182,7 +182,7 @@ class ChangePhoneNumberController: Dependencies {
|
||||
// MARK: -
|
||||
|
||||
func firstViewController() -> UIViewController {
|
||||
ChangePhoneNumberSplashViewController(changePhoneNumberController: self)
|
||||
Deprecated_ChangePhoneNumberSplashViewController(changePhoneNumberController: self)
|
||||
}
|
||||
|
||||
public func verificationDidRequire2FAPin(viewController: UIViewController,
|
||||
@ -196,7 +196,7 @@ class ChangePhoneNumberController: Dependencies {
|
||||
return
|
||||
}
|
||||
|
||||
guard !(navigationController.topViewController is ChangePhoneNumber2FAViewController) else {
|
||||
guard !(navigationController.topViewController is Deprecated_ChangePhoneNumber2FAViewController) else {
|
||||
// 2fa view is already presented, we don't need to push it again.
|
||||
return
|
||||
}
|
||||
@ -206,7 +206,7 @@ class ChangePhoneNumberController: Dependencies {
|
||||
return
|
||||
}
|
||||
|
||||
let view = ChangePhoneNumber2FAViewController(changePhoneNumberController: self,
|
||||
let view = Deprecated_ChangePhoneNumber2FAViewController(changePhoneNumberController: self,
|
||||
oldPhoneNumber: oldPhoneNumber,
|
||||
newPhoneNumber: newPhoneNumber,
|
||||
kbsAuth: kbsAuth)
|
||||
@ -249,7 +249,7 @@ class ChangePhoneNumberController: Dependencies {
|
||||
return
|
||||
}
|
||||
|
||||
let view = ChangePhoneNumberCaptchaViewController(changePhoneNumberController: self,
|
||||
let view = Deprecated_ChangePhoneNumberCaptchaViewController(changePhoneNumberController: self,
|
||||
oldPhoneNumber: oldPhoneNumber,
|
||||
newPhoneNumber: newPhoneNumber)
|
||||
navigationController.pushViewController(view, animated: true)
|
||||
@ -258,7 +258,7 @@ class ChangePhoneNumberController: Dependencies {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension ChangePhoneNumberController: RegistrationHelperDelegate {
|
||||
extension Deprecated_ChangePhoneNumberController: Deprecated_RegistrationHelperDelegate {
|
||||
|
||||
public func registrationRequestVerificationDidSucceed(fromViewController: UIViewController) {
|
||||
AssertIsOnMainThread()
|
||||
@ -276,7 +276,7 @@ extension ChangePhoneNumberController: RegistrationHelperDelegate {
|
||||
return
|
||||
}
|
||||
|
||||
let vc = ChangePhoneNumberVerificationViewController(changePhoneNumberController: self,
|
||||
let vc = Deprecated_ChangePhoneNumberVerificationViewController(changePhoneNumberController: self,
|
||||
oldPhoneNumber: oldPhoneNumber,
|
||||
newPhoneNumber: newPhoneNumber)
|
||||
navigationController.pushViewController(vc, animated: true)
|
||||
@ -293,10 +293,10 @@ extension ChangePhoneNumberController: RegistrationHelperDelegate {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension ChangePhoneNumberController: RegistrationPinAttemptsExhaustedViewDelegate {
|
||||
extension Deprecated_ChangePhoneNumberController: Deprecated_RegistrationPinAttemptsExhaustedViewDelegate {
|
||||
var hasPendingRestoration: Bool { false }
|
||||
|
||||
func pinAttemptsExhaustedViewDidComplete(viewController: RegistrationPinAttemptsExhaustedViewController) {
|
||||
func pinAttemptsExhaustedViewDidComplete(viewController: Deprecated_RegistrationPinAttemptsExhaustedViewController) {
|
||||
dismissFlow(didSucceed: false)
|
||||
}
|
||||
}
|
||||
@ -6,13 +6,13 @@
|
||||
import Foundation
|
||||
import SignalServiceKit
|
||||
|
||||
class ChangePhoneNumberInputViewController: OWSTableViewController2 {
|
||||
class Deprecated_ChangePhoneNumberInputViewController: OWSTableViewController2 {
|
||||
|
||||
private let changePhoneNumberController: ChangePhoneNumberController
|
||||
private let changePhoneNumberController: Deprecated_ChangePhoneNumberController
|
||||
private let oldValueViews: ChangePhoneNumberValueViews
|
||||
private let newValueViews: ChangePhoneNumberValueViews
|
||||
|
||||
public init(changePhoneNumberController: ChangePhoneNumberController) {
|
||||
public init(changePhoneNumberController: Deprecated_ChangePhoneNumberController) {
|
||||
self.changePhoneNumberController = changePhoneNumberController
|
||||
|
||||
self.oldValueViews = ChangePhoneNumberValueViews(.oldValue,
|
||||
@ -186,7 +186,7 @@ class ChangePhoneNumberInputViewController: OWSTableViewController2 {
|
||||
oldValueViews.phoneNumberTextField.resignFirstResponder()
|
||||
newValueViews.phoneNumberTextField.resignFirstResponder()
|
||||
|
||||
let vc = ChangePhoneNumberConfirmViewController(changePhoneNumberController: changePhoneNumberController,
|
||||
let vc = Deprecated_ChangePhoneNumberConfirmViewController(changePhoneNumberController: changePhoneNumberController,
|
||||
oldPhoneNumber: phoneNumbers.oldPhoneNumber,
|
||||
newPhoneNumber: phoneNumbers.newPhoneNumber)
|
||||
self.navigationController?.pushViewController(vc, animated: true)
|
||||
@ -236,7 +236,7 @@ class ChangePhoneNumberInputViewController: OWSTableViewController2 {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension ChangePhoneNumberInputViewController: ChangePhoneNumberValueViewsDelegate {
|
||||
extension Deprecated_ChangePhoneNumberInputViewController: ChangePhoneNumberValueViewsDelegate {
|
||||
fileprivate func valueDidChange(valueViews: ChangePhoneNumberValueViews) {
|
||||
AssertIsOnMainThread()
|
||||
|
||||
@ -271,9 +271,9 @@ private class ChangePhoneNumberValueViews: NSObject {
|
||||
}
|
||||
let value: Value
|
||||
|
||||
private let changePhoneNumberController: ChangePhoneNumberController
|
||||
private let changePhoneNumberController: Deprecated_ChangePhoneNumberController
|
||||
|
||||
public init(_ value: Value, changePhoneNumberController: ChangePhoneNumberController) {
|
||||
public init(_ value: Value, changePhoneNumberController: Deprecated_ChangePhoneNumberController) {
|
||||
self.value = value
|
||||
self.changePhoneNumberController = changePhoneNumberController
|
||||
|
||||
@ -8,14 +8,14 @@ import SignalServiceKit
|
||||
import UIKit
|
||||
import SignalMessaging
|
||||
|
||||
class ChangePhoneNumberSplashViewController: OWSViewController, OWSNavigationChildController {
|
||||
class Deprecated_ChangePhoneNumberSplashViewController: OWSViewController, OWSNavigationChildController {
|
||||
|
||||
private let changePhoneNumberController: ChangePhoneNumberController
|
||||
private let changePhoneNumberController: Deprecated_ChangePhoneNumberController
|
||||
|
||||
private let bottomContainer = UIView()
|
||||
private let scrollingStack = UIStackView()
|
||||
|
||||
public init(changePhoneNumberController: ChangePhoneNumberController) {
|
||||
public init(changePhoneNumberController: Deprecated_ChangePhoneNumberController) {
|
||||
self.changePhoneNumberController = changePhoneNumberController
|
||||
super.init()
|
||||
}
|
||||
@ -134,7 +134,7 @@ class ChangePhoneNumberSplashViewController: OWSViewController, OWSNavigationChi
|
||||
|
||||
@objc
|
||||
private func didTapContinue(_ sender: UIButton) {
|
||||
let view = ChangePhoneNumberInputViewController(changePhoneNumberController: changePhoneNumberController)
|
||||
let view = Deprecated_ChangePhoneNumberInputViewController(changePhoneNumberController: changePhoneNumberController)
|
||||
self.navigationController?.pushViewController(view, animated: true)
|
||||
}
|
||||
}
|
||||
@ -8,15 +8,15 @@ import SignalCoreKit
|
||||
|
||||
// Most of the logic for the verification views resides in RegistrationVerificationViewController.
|
||||
@objc
|
||||
public class ChangePhoneNumberVerificationViewController: RegistrationBaseViewController {
|
||||
public class Deprecated_ChangePhoneNumberVerificationViewController: Deprecated_RegistrationBaseViewController {
|
||||
|
||||
private let changePhoneNumberController: ChangePhoneNumberController
|
||||
private let changePhoneNumberController: Deprecated_ChangePhoneNumberController
|
||||
private let oldPhoneNumber: PhoneNumber
|
||||
private let newPhoneNumber: PhoneNumber
|
||||
|
||||
let viewModel = RegistrationVerificationViewModel()
|
||||
let viewModel = Deprecated_RegistrationVerificationViewModel()
|
||||
|
||||
init(changePhoneNumberController: ChangePhoneNumberController,
|
||||
init(changePhoneNumberController: Deprecated_ChangePhoneNumberController,
|
||||
oldPhoneNumber: PhoneNumber,
|
||||
newPhoneNumber: PhoneNumber) {
|
||||
self.changePhoneNumberController = changePhoneNumberController
|
||||
@ -79,7 +79,7 @@ public class ChangePhoneNumberVerificationViewController: RegistrationBaseViewCo
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension ChangePhoneNumberVerificationViewController: RegistrationVerificationViewController {
|
||||
extension Deprecated_ChangePhoneNumberVerificationViewController: Deprecated_RegistrationVerificationViewController {
|
||||
var phoneNumberE164: String? {
|
||||
newPhoneNumber.toE164()
|
||||
}
|
||||
@ -108,7 +108,7 @@ extension ChangePhoneNumberVerificationViewController: RegistrationVerificationV
|
||||
|
||||
let viewModel = self.viewModel
|
||||
let formattedPhoneNumber = PhoneNumber.bestEffortLocalizedPhoneNumber(withE164: phoneNumberE164 ?? "")
|
||||
RegistrationHelper.presentPhoneNumberConfirmationSheet(from: self,
|
||||
Deprecated_RegistrationHelper.presentPhoneNumberConfirmationSheet(from: self,
|
||||
number: formattedPhoneNumber) { [weak self] shouldContinue in
|
||||
guard let self = self else { return }
|
||||
guard shouldContinue else {
|
||||
@ -133,7 +133,7 @@ extension ChangePhoneNumberVerificationViewController: RegistrationVerificationV
|
||||
Logger.info("")
|
||||
|
||||
let phoneNumberVC = navigationController?.viewControllers
|
||||
.filter { $0 is ChangePhoneNumberSplashViewController }.last
|
||||
.filter { $0 is Deprecated_ChangePhoneNumberSplashViewController }.last
|
||||
|
||||
if let phoneNumberVC = phoneNumberVC {
|
||||
self.navigationController?.popToViewController(phoneNumberVC, animated: true)
|
||||
@ -6,7 +6,7 @@
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
public class RegistrationBaseViewController: OWSViewController, OWSNavigationChildController {
|
||||
public class Deprecated_RegistrationBaseViewController: OWSViewController, OWSNavigationChildController {
|
||||
|
||||
// MARK: - Factory Methods
|
||||
|
||||
@ -7,9 +7,9 @@ import Foundation
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
protocol RegistrationCaptchaViewController: AnyObject {
|
||||
protocol Deprecated_RegistrationCaptchaViewController: AnyObject {
|
||||
|
||||
var viewModel: RegistrationCaptchaViewModel { get }
|
||||
var viewModel: Deprecated_RegistrationCaptchaViewModel { get }
|
||||
var primaryView: UIView { get }
|
||||
|
||||
func requestCaptchaVerification(captchaToken: String)
|
||||
@ -18,14 +18,14 @@ protocol RegistrationCaptchaViewController: AnyObject {
|
||||
// MARK: -
|
||||
|
||||
@objc
|
||||
class RegistrationCaptchaViewModel: NSObject {
|
||||
weak var viewController: RegistrationCaptchaViewController?
|
||||
class Deprecated_RegistrationCaptchaViewModel: NSObject {
|
||||
weak var viewController: Deprecated_RegistrationCaptchaViewController?
|
||||
|
||||
let captchaView = CaptchaView(context: .registration)
|
||||
|
||||
// MARK: - Methods
|
||||
|
||||
func createViews(vc: RegistrationBaseViewController) {
|
||||
func createViews(vc: Deprecated_RegistrationBaseViewController) {
|
||||
AssertIsOnMainThread()
|
||||
|
||||
let primaryView = vc.primaryView
|
||||
@ -101,7 +101,7 @@ class RegistrationCaptchaViewModel: NSObject {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension RegistrationCaptchaViewModel: CaptchaViewDelegate {
|
||||
extension Deprecated_RegistrationCaptchaViewModel: CaptchaViewDelegate {
|
||||
|
||||
public func captchaView(_: CaptchaView, didCompleteCaptchaWithToken token: String) {
|
||||
requestCaptchaVerification(captchaToken: token)
|
||||
@ -7,7 +7,7 @@ import Foundation
|
||||
import SignalServiceKit
|
||||
import SignalMessaging
|
||||
|
||||
public protocol RegistrationHelperDelegate: AnyObject {
|
||||
public protocol Deprecated_RegistrationHelperDelegate: AnyObject {
|
||||
func registrationRequestVerificationDidSucceed(fromViewController: UIViewController)
|
||||
func registrationRequestVerificationDidRequireCaptcha(fromViewController: UIViewController)
|
||||
func registrationIncrementVerificationRequestCount()
|
||||
@ -15,7 +15,7 @@ public protocol RegistrationHelperDelegate: AnyObject {
|
||||
|
||||
// MARK: -
|
||||
|
||||
public class RegistrationHelper: Dependencies {
|
||||
public class Deprecated_RegistrationHelper: Dependencies {
|
||||
|
||||
public typealias VerificationCompletion = (_ willTransition: Bool, _ error: Error?) -> Void
|
||||
|
||||
@ -23,7 +23,7 @@ public class RegistrationHelper: Dependencies {
|
||||
private static let forceCaptcha = false
|
||||
#endif
|
||||
|
||||
public static func requestRegistrationVerification(delegate: RegistrationHelperDelegate,
|
||||
public static func requestRegistrationVerification(delegate: Deprecated_RegistrationHelperDelegate,
|
||||
fromViewController: UIViewController,
|
||||
phoneNumber: RegistrationPhoneNumber?,
|
||||
countryState: RegistrationCountryState,
|
||||
@ -41,7 +41,7 @@ public class RegistrationHelper: Dependencies {
|
||||
|
||||
}
|
||||
|
||||
public static func requestChangePhoneNumberVerification(delegate: RegistrationHelperDelegate,
|
||||
public static func requestChangePhoneNumberVerification(delegate: Deprecated_RegistrationHelperDelegate,
|
||||
fromViewController: UIViewController,
|
||||
phoneNumber: RegistrationPhoneNumber?,
|
||||
countryState: RegistrationCountryState,
|
||||
@ -59,7 +59,7 @@ public class RegistrationHelper: Dependencies {
|
||||
}
|
||||
|
||||
private static func requestVerification(mode: AccountManager.VerificationMode,
|
||||
delegate: RegistrationHelperDelegate,
|
||||
delegate: Deprecated_RegistrationHelperDelegate,
|
||||
fromViewController: UIViewController,
|
||||
phoneNumber: RegistrationPhoneNumber?,
|
||||
countryState: RegistrationCountryState,
|
||||
@ -98,10 +98,10 @@ public class RegistrationHelper: Dependencies {
|
||||
delegate.registrationIncrementVerificationRequestCount()
|
||||
|
||||
firstly { () -> Promise<Void> in
|
||||
self.accountManager.requestAccountVerification(e164: phoneNumber.e164,
|
||||
captchaToken: captchaToken,
|
||||
isSMS: isSMS,
|
||||
mode: mode)
|
||||
self.accountManager.deprecated_requestAccountVerification(e164: phoneNumber.e164,
|
||||
captchaToken: captchaToken,
|
||||
isSMS: isSMS,
|
||||
mode: mode)
|
||||
}.done { [weak delegate] in
|
||||
completion?(true, nil)
|
||||
delegate?.registrationRequestVerificationDidSucceed(fromViewController: fromViewController)
|
||||
@ -115,7 +115,7 @@ public class RegistrationHelper: Dependencies {
|
||||
|
||||
private static func handleVerificationError(error: Error,
|
||||
fromViewController: UIViewController,
|
||||
delegate: RegistrationHelperDelegate?,
|
||||
delegate: Deprecated_RegistrationHelperDelegate?,
|
||||
completion: VerificationCompletion?) {
|
||||
AssertIsOnMainThread()
|
||||
|
||||
@ -6,22 +6,22 @@
|
||||
import UIKit
|
||||
import SafariServices
|
||||
|
||||
protocol RegistrationPinAttemptsExhaustedViewDelegate: AnyObject {
|
||||
protocol Deprecated_RegistrationPinAttemptsExhaustedViewDelegate: AnyObject {
|
||||
var hasPendingRestoration: Bool { get }
|
||||
|
||||
func pinAttemptsExhaustedViewDidComplete(viewController: RegistrationPinAttemptsExhaustedViewController)
|
||||
func pinAttemptsExhaustedViewDidComplete(viewController: Deprecated_RegistrationPinAttemptsExhaustedViewController)
|
||||
}
|
||||
|
||||
// MARK: -
|
||||
|
||||
@objc
|
||||
public class RegistrationPinAttemptsExhaustedViewController: RegistrationBaseViewController {
|
||||
public class Deprecated_RegistrationPinAttemptsExhaustedViewController: Deprecated_RegistrationBaseViewController {
|
||||
|
||||
private weak var delegate: RegistrationPinAttemptsExhaustedViewDelegate?
|
||||
private weak var delegate: Deprecated_RegistrationPinAttemptsExhaustedViewDelegate?
|
||||
|
||||
var hasPendingRestoration: Bool { delegate?.hasPendingRestoration ?? false }
|
||||
|
||||
required init(delegate: RegistrationPinAttemptsExhaustedViewDelegate) {
|
||||
required init(delegate: Deprecated_RegistrationPinAttemptsExhaustedViewDelegate) {
|
||||
self.delegate = delegate
|
||||
}
|
||||
|
||||
@ -70,7 +70,7 @@ public class RegistrationPinAttemptsExhaustedViewController: RegistrationBaseVie
|
||||
selector: #selector(primaryButtonPressed)
|
||||
)
|
||||
primaryButton.accessibilityIdentifier = "onboarding.pinAtttemptsExhausted." + "primaryButton"
|
||||
let primaryButtonView = OnboardingBaseViewController.horizontallyWrap(primaryButton: primaryButton)
|
||||
let primaryButtonView = Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: primaryButton)
|
||||
|
||||
let linkButton = self.linkButton(
|
||||
title: linkButtonText,
|
||||
@ -7,9 +7,9 @@ import UIKit
|
||||
import SignalCoreKit
|
||||
|
||||
@objc
|
||||
protocol RegistrationVerificationViewController: AnyObject {
|
||||
protocol Deprecated_RegistrationVerificationViewController: AnyObject {
|
||||
|
||||
var viewModel: RegistrationVerificationViewModel { get }
|
||||
var viewModel: Deprecated_RegistrationVerificationViewModel { get }
|
||||
var primaryView: UIView { get }
|
||||
var phoneNumberE164: String? { get }
|
||||
|
||||
@ -23,15 +23,15 @@ protocol RegistrationVerificationViewController: AnyObject {
|
||||
// MARK: -
|
||||
|
||||
@objc
|
||||
class RegistrationVerificationViewModel: NSObject {
|
||||
weak var viewController: RegistrationVerificationViewController?
|
||||
class Deprecated_RegistrationVerificationViewModel: NSObject {
|
||||
weak var viewController: Deprecated_RegistrationVerificationViewController?
|
||||
|
||||
var canResend = false
|
||||
var titleLabel: UILabel?
|
||||
var subtitleLabel: UILabel?
|
||||
var backLink: OWSFlatButton?
|
||||
var backButtonSpacer: UIView?
|
||||
let verificationCodeView = RegistrationVerificationCodeView()
|
||||
let verificationCodeView = Deprecated_RegistrationVerificationCodeView()
|
||||
var resendCodeButton: OWSFlatButton?
|
||||
var callMeButton: OWSFlatButton?
|
||||
let errorLabel = UILabel()
|
||||
@ -48,7 +48,7 @@ class RegistrationVerificationViewModel: NSObject {
|
||||
|
||||
// MARK: - Methods
|
||||
|
||||
func createViews(vc: RegistrationBaseViewController) {
|
||||
func createViews(vc: Deprecated_RegistrationBaseViewController) {
|
||||
AssertIsOnMainThread()
|
||||
|
||||
guard let viewController = self.viewController else {
|
||||
@ -401,7 +401,7 @@ class RegistrationVerificationViewModel: NSObject {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension RegistrationVerificationViewModel: RegistrationVerificationCodeViewDelegate {
|
||||
extension Deprecated_RegistrationVerificationViewModel: RegistrationVerificationCodeViewDelegate {
|
||||
public func codeViewDidChange() {
|
||||
AssertIsOnMainThread()
|
||||
|
||||
@ -413,13 +413,13 @@ extension RegistrationVerificationViewModel: RegistrationVerificationCodeViewDel
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension RegistrationVerificationViewController {
|
||||
extension Deprecated_RegistrationVerificationViewController {
|
||||
var canResend: Bool { viewModel.canResend }
|
||||
var titleLabel: UILabel? { viewModel.titleLabel }
|
||||
var subtitleLabel: UILabel? { viewModel.subtitleLabel }
|
||||
var backLink: OWSFlatButton? { viewModel.backLink }
|
||||
var backButtonSpacer: UIView? { viewModel.backButtonSpacer }
|
||||
var verificationCodeView: RegistrationVerificationCodeView { viewModel.verificationCodeView }
|
||||
var verificationCodeView: Deprecated_RegistrationVerificationCodeView { viewModel.verificationCodeView }
|
||||
var resendCodeButton: OWSFlatButton? { viewModel.resendCodeButton }
|
||||
var callMeButton: OWSFlatButton? { viewModel.callMeButton }
|
||||
var errorLabel: UILabel { viewModel.errorLabel }
|
||||
@ -480,7 +480,7 @@ protocol RegistrationVerificationCodeViewDelegate: AnyObject {
|
||||
// We use a separate UILabel for each digit, and move
|
||||
// around a single UITextfield to let the user edit the
|
||||
// last/next digit.
|
||||
class RegistrationVerificationCodeView: UIView {
|
||||
class Deprecated_RegistrationVerificationCodeView: UIView {
|
||||
|
||||
weak var delegate: RegistrationVerificationCodeViewDelegate?
|
||||
|
||||
@ -646,7 +646,7 @@ class RegistrationVerificationCodeView: UIView {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension RegistrationVerificationCodeView: UITextFieldDelegate {
|
||||
extension Deprecated_RegistrationVerificationCodeView: UITextFieldDelegate {
|
||||
public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString newString: String) -> Bool {
|
||||
var oldText = ""
|
||||
if let textFieldText = textField.text {
|
||||
@ -679,7 +679,7 @@ extension RegistrationVerificationCodeView: UITextFieldDelegate {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension RegistrationVerificationCodeView: RegistrationVerificationCodeTextFieldDelegate {
|
||||
extension Deprecated_RegistrationVerificationCodeView: RegistrationVerificationCodeTextFieldDelegate {
|
||||
public func textFieldDidDeletePrevious() {
|
||||
if digitText.isEmpty { return }
|
||||
digitText = digitText.substring(to: currentDigitIndex - 1)
|
||||
@ -6,7 +6,7 @@
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
public class OnboardingTransferChoiceViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_OnboardingTransferChoiceViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
public override var primaryLayoutMargins: UIEdgeInsets {
|
||||
var defaultMargins = super.primaryLayoutMargins
|
||||
@ -222,7 +222,7 @@ public class OnboardingTransferChoiceViewController: OnboardingBaseViewControlle
|
||||
|
||||
switch onboardingController.onboardingMode {
|
||||
case .provisioning:
|
||||
let prepViewController = SecondaryLinkingPrepViewController(onboardingController: onboardingController, isTransferring: true)
|
||||
let prepViewController = Deprecated_SecondaryLinkingPrepViewController(onboardingController: onboardingController, isTransferring: true)
|
||||
navigationController?.pushViewController(prepViewController, animated: true)
|
||||
case .registering:
|
||||
onboardingController.transferAccount(fromViewController: self)
|
||||
@ -235,7 +235,7 @@ public class OnboardingTransferChoiceViewController: OnboardingBaseViewControlle
|
||||
|
||||
switch onboardingController.onboardingMode {
|
||||
case .provisioning:
|
||||
let prepViewController = SecondaryLinkingPrepViewController(onboardingController: onboardingController, isTransferring: false)
|
||||
let prepViewController = Deprecated_SecondaryLinkingPrepViewController(onboardingController: onboardingController, isTransferring: false)
|
||||
navigationController?.pushViewController(prepViewController, animated: true)
|
||||
case .registering:
|
||||
onboardingController.submitVerification(fromViewController: self, checkForAvailableTransfer: false, completion: { outcome in
|
||||
@ -8,11 +8,11 @@ import SignalMessaging
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
public class OnboardingTransferProgressViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_OnboardingTransferProgressViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
let progressView: TransferProgressView
|
||||
|
||||
public init(onboardingController: OnboardingController, progress: Progress) {
|
||||
public init(onboardingController: Deprecated_OnboardingController, progress: Progress) {
|
||||
self.progressView = TransferProgressView(progress: progress)
|
||||
super.init(onboardingController: onboardingController)
|
||||
}
|
||||
@ -114,7 +114,7 @@ public class OnboardingTransferProgressViewController: OnboardingBaseViewControl
|
||||
}
|
||||
}
|
||||
|
||||
extension OnboardingTransferProgressViewController: DeviceTransferServiceObserver {
|
||||
extension Deprecated_OnboardingTransferProgressViewController: DeviceTransferServiceObserver {
|
||||
func deviceTransferServiceDiscoveredNewDevice(peerId: MCPeerID, discoveryInfo: [String: String]?) {}
|
||||
|
||||
func deviceTransferServiceDidStartTransfer(progress: Progress) {}
|
||||
@ -7,7 +7,7 @@ import Foundation
|
||||
import MultipeerConnectivity
|
||||
import SignalMessaging
|
||||
|
||||
public class OnboardingTransferQRCodeViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_OnboardingTransferQRCodeViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
private let qrCodeView = QRCodeView()
|
||||
|
||||
@ -176,7 +176,7 @@ public class OnboardingTransferQRCodeViewController: OnboardingBaseViewControlle
|
||||
}
|
||||
}
|
||||
|
||||
extension OnboardingTransferQRCodeViewController: DeviceTransferServiceObserver {
|
||||
extension Deprecated_OnboardingTransferQRCodeViewController: DeviceTransferServiceObserver {
|
||||
func deviceTransferServiceDiscoveredNewDevice(peerId: MCPeerID, discoveryInfo: [String: String]?) {}
|
||||
|
||||
func deviceTransferServiceDidStartTransfer(progress: Progress) {
|
||||
@ -11,7 +11,7 @@ import GameController
|
||||
#endif
|
||||
|
||||
@objc
|
||||
public class Onboarding2FAViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_Onboarding2FAViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
// When the users attempts remaining falls below this number,
|
||||
// we will show an alert with more detail about the risks.
|
||||
@ -59,7 +59,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController {
|
||||
|
||||
private let context: ViewControllerContext
|
||||
|
||||
public init(onboardingController: OnboardingController, isUsingKBS: Bool) {
|
||||
public init(onboardingController: Deprecated_OnboardingController, isUsingKBS: Bool) {
|
||||
// TODO[ViewContextPiping]
|
||||
self.context = ViewControllerContext.shared
|
||||
self.isUsingKBS = isUsingKBS
|
||||
@ -130,7 +130,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController {
|
||||
pinTypeToggle.accessibilityIdentifier = "onboarding.2fa." + "pinTypeToggle"
|
||||
|
||||
nextButton.accessibilityIdentifier = "onboarding.2fa." + "nextButton"
|
||||
let primaryButtonView = OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
let primaryButtonView = Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
|
||||
let topSpacer = UIView.vStretchingSpacer()
|
||||
let bottomSpacer = UIView.vStretchingSpacer()
|
||||
@ -352,7 +352,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController {
|
||||
return
|
||||
}
|
||||
|
||||
let vc = RegistrationPinAttemptsExhaustedViewController(delegate: onboardingController)
|
||||
let vc = Deprecated_RegistrationPinAttemptsExhaustedViewController(delegate: onboardingController)
|
||||
navigationController.pushViewController(vc, animated: true)
|
||||
}
|
||||
|
||||
@ -474,7 +474,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension Onboarding2FAViewController: UITextFieldDelegate {
|
||||
extension Deprecated_Onboarding2FAViewController: UITextFieldDelegate {
|
||||
public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
|
||||
let hasPendingChanges: Bool
|
||||
if pinType == .numeric {
|
||||
@ -6,20 +6,20 @@
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
public class OnboardingBaseViewController: RegistrationBaseViewController {
|
||||
public class Deprecated_OnboardingBaseViewController: Deprecated_RegistrationBaseViewController {
|
||||
|
||||
// Unlike a delegate, we can and should retain a strong reference to the OnboardingController.
|
||||
let onboardingController: OnboardingController
|
||||
let onboardingController: Deprecated_OnboardingController
|
||||
|
||||
@objc
|
||||
public init(onboardingController: OnboardingController) {
|
||||
public init(onboardingController: Deprecated_OnboardingController) {
|
||||
self.onboardingController = onboardingController
|
||||
|
||||
super.init()
|
||||
}
|
||||
|
||||
func shouldShowBackButton() -> Bool {
|
||||
return onboardingController.onboardingMode != OnboardingController.defaultOnboardingMode
|
||||
return onboardingController.onboardingMode != Deprecated_OnboardingController.defaultOnboardingMode
|
||||
}
|
||||
|
||||
// MARK: - View Lifecycle
|
||||
@ -6,9 +6,9 @@
|
||||
import SignalCoreKit
|
||||
|
||||
@objc
|
||||
public class OnboardingCaptchaViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_OnboardingCaptchaViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
let viewModel = RegistrationCaptchaViewModel()
|
||||
let viewModel = Deprecated_RegistrationCaptchaViewModel()
|
||||
|
||||
override public func loadView() {
|
||||
viewModel.viewController = self
|
||||
@ -28,7 +28,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension OnboardingCaptchaViewController: RegistrationCaptchaViewController {
|
||||
extension Deprecated_OnboardingCaptchaViewController: Deprecated_RegistrationCaptchaViewController {
|
||||
|
||||
func requestCaptchaVerification(captchaToken: String) {
|
||||
AssertIsOnMainThread()
|
||||
@ -7,11 +7,11 @@ import UIKit
|
||||
import SignalServiceKit
|
||||
|
||||
@objc
|
||||
public class OnboardingNavigationController: OWSNavigationController {
|
||||
private(set) var onboardingController: OnboardingController!
|
||||
public class Deprecated_OnboardingNavigationController: OWSNavigationController {
|
||||
private(set) var onboardingController: Deprecated_OnboardingController!
|
||||
|
||||
@objc
|
||||
public init(onboardingController: OnboardingController) {
|
||||
public init(onboardingController: Deprecated_OnboardingController) {
|
||||
self.onboardingController = onboardingController
|
||||
super.init()
|
||||
if let nextMilestone = onboardingController.nextMilestone {
|
||||
@ -34,7 +34,7 @@ public class OnboardingNavigationController: OWSNavigationController {
|
||||
// MARK: -
|
||||
|
||||
@objc
|
||||
public class OnboardingController: NSObject {
|
||||
public class Deprecated_OnboardingController: NSObject {
|
||||
|
||||
public enum OnboardingMode {
|
||||
case provisioning
|
||||
@ -58,7 +58,7 @@ public class OnboardingController: NSObject {
|
||||
convenience override init() {
|
||||
// TODO[ViewContextPiping]
|
||||
let context = ViewControllerContext.shared
|
||||
let onboardingMode = OnboardingController.ascertainOnboardingMode()
|
||||
let onboardingMode = Deprecated_OnboardingController.ascertainOnboardingMode()
|
||||
self.init(context: context, onboardingMode: onboardingMode)
|
||||
}
|
||||
|
||||
@ -182,15 +182,15 @@ public class OnboardingController: NSObject {
|
||||
Logger.info("milestone: \(milestone)")
|
||||
switch milestone {
|
||||
case .verifiedPhoneNumber, .verifiedLinkedDevice:
|
||||
return OnboardingSplashViewController(onboardingController: self)
|
||||
return Deprecated_OnboardingSplashViewController(onboardingController: self)
|
||||
case .setupProfile:
|
||||
return OnboardingProfileCreationViewController(onboardingController: self)
|
||||
return Deprecated_OnboardingProfileCreationViewController(onboardingController: self)
|
||||
case .restorePin:
|
||||
return Onboarding2FAViewController(onboardingController: self, isUsingKBS: true)
|
||||
return Deprecated_Onboarding2FAViewController(onboardingController: self, isUsingKBS: true)
|
||||
case .setupPin:
|
||||
return buildPinSetupViewController()
|
||||
case .phoneNumberDiscoverability:
|
||||
return RegistrationPhoneNumberDiscoverabilityViewController(onboardingController: self)
|
||||
return Deprecated_RegistrationPhoneNumberDiscoverabilityViewController(onboardingController: self)
|
||||
}
|
||||
}
|
||||
|
||||
@ -209,7 +209,7 @@ public class OnboardingController: NSObject {
|
||||
|
||||
Logger.info("")
|
||||
|
||||
let view = OnboardingModeSwitchConfirmationViewController(onboardingController: self)
|
||||
let view = Deprecated_OnboardingModeSwitchConfirmationViewController(onboardingController: self)
|
||||
viewController.navigationController?.pushViewController(view, animated: true)
|
||||
}
|
||||
|
||||
@ -245,10 +245,10 @@ public class OnboardingController: NSObject {
|
||||
AssertIsOnMainThread()
|
||||
|
||||
if onboardingMode == .provisioning {
|
||||
let view = OnboardingTransferChoiceViewController(onboardingController: self)
|
||||
let view = Deprecated_OnboardingTransferChoiceViewController(onboardingController: self)
|
||||
navigationController.pushViewController(view, animated: true)
|
||||
} else {
|
||||
let view = RegistrationPhoneNumberViewController(onboardingController: self)
|
||||
let view = Deprecated_RegistrationPhoneNumberViewController(onboardingController: self)
|
||||
navigationController.pushViewController(view, animated: true)
|
||||
}
|
||||
}
|
||||
@ -259,7 +259,7 @@ public class OnboardingController: NSObject {
|
||||
// Disable interaction during the asynchronous operation.
|
||||
oldViewController.view.isUserInteractionEnabled = false
|
||||
|
||||
let newViewController = OnboardingPermissionsViewController(onboardingController: self)
|
||||
let newViewController = Deprecated_OnboardingPermissionsViewController(onboardingController: self)
|
||||
|
||||
firstly(on: .sharedUserInitiated) {
|
||||
newViewController.needsToAskForAnyPermissions()
|
||||
@ -295,7 +295,7 @@ public class OnboardingController: NSObject {
|
||||
// TODO: Once notification work is complete, uncomment this.
|
||||
// Self.notificationPresenter.cancelIncompleteRegistrationNotification()
|
||||
|
||||
let view = OnboardingVerificationViewController(onboardingController: self)
|
||||
let view = Deprecated_OnboardingVerificationViewController(onboardingController: self)
|
||||
viewController.navigationController?.pushViewController(view, animated: true)
|
||||
}
|
||||
|
||||
@ -313,11 +313,11 @@ public class OnboardingController: NSObject {
|
||||
// from the "code verification" view. The "Captcha" view should always appear
|
||||
// immediately after the "phone number" view.
|
||||
while navigationController.viewControllers.count > 1 &&
|
||||
!(navigationController.topViewController is RegistrationPhoneNumberViewController) {
|
||||
!(navigationController.topViewController is Deprecated_RegistrationPhoneNumberViewController) {
|
||||
navigationController.popViewController(animated: false)
|
||||
}
|
||||
|
||||
let view = OnboardingCaptchaViewController(onboardingController: self)
|
||||
let view = Deprecated_OnboardingCaptchaViewController(onboardingController: self)
|
||||
navigationController.pushViewController(view, animated: true)
|
||||
}
|
||||
|
||||
@ -372,12 +372,12 @@ public class OnboardingController: NSObject {
|
||||
return
|
||||
}
|
||||
|
||||
guard !(navigationController.topViewController is Onboarding2FAViewController) else {
|
||||
guard !(navigationController.topViewController is Deprecated_Onboarding2FAViewController) else {
|
||||
// 2fa view is already presented, we don't need to push it again.
|
||||
return
|
||||
}
|
||||
|
||||
let view = Onboarding2FAViewController(onboardingController: self, isUsingKBS: kbsAuth != nil)
|
||||
let view = Deprecated_Onboarding2FAViewController(onboardingController: self, isUsingKBS: kbsAuth != nil)
|
||||
navigationController.pushViewController(view, animated: true)
|
||||
}
|
||||
|
||||
@ -492,13 +492,13 @@ public class OnboardingController: NSObject {
|
||||
// MARK: - Registration
|
||||
|
||||
public func presentPhoneNumberConfirmationSheet(from vc: UIViewController, number: String, completion: @escaping (_ didApprove: Bool) -> Void) {
|
||||
RegistrationHelper.presentPhoneNumberConfirmationSheet(from: vc, number: number, completion: completion)
|
||||
Deprecated_RegistrationHelper.presentPhoneNumberConfirmationSheet(from: vc, number: number, completion: completion)
|
||||
}
|
||||
|
||||
public func requestVerification(
|
||||
fromViewController: UIViewController,
|
||||
isSMS: Bool,
|
||||
completion: RegistrationHelper.VerificationCompletion?) {
|
||||
completion: Deprecated_RegistrationHelper.VerificationCompletion?) {
|
||||
|
||||
AssertIsOnMainThread()
|
||||
|
||||
@ -512,7 +512,7 @@ public class OnboardingController: NSObject {
|
||||
return
|
||||
}
|
||||
|
||||
RegistrationHelper.requestRegistrationVerification(delegate: self,
|
||||
Deprecated_RegistrationHelper.requestRegistrationVerification(delegate: self,
|
||||
fromViewController: fromViewController,
|
||||
phoneNumber: phoneNumber,
|
||||
countryState: countryState,
|
||||
@ -533,12 +533,12 @@ public class OnboardingController: NSObject {
|
||||
return
|
||||
}
|
||||
|
||||
guard !(navigationController.topViewController is OnboardingTransferQRCodeViewController) else {
|
||||
guard !(navigationController.topViewController is Deprecated_OnboardingTransferQRCodeViewController) else {
|
||||
// qr code view is already presented, we don't need to push it again.
|
||||
return
|
||||
}
|
||||
|
||||
let view = OnboardingTransferQRCodeViewController(onboardingController: self)
|
||||
let view = Deprecated_OnboardingTransferQRCodeViewController(onboardingController: self)
|
||||
navigationController.pushViewController(view, animated: true)
|
||||
}
|
||||
|
||||
@ -552,12 +552,12 @@ public class OnboardingController: NSObject {
|
||||
return
|
||||
}
|
||||
|
||||
guard !(navigationController.topViewController is OnboardingTransferProgressViewController) else {
|
||||
guard !(navigationController.topViewController is Deprecated_OnboardingTransferProgressViewController) else {
|
||||
// qr code view is already presented, we don't need to push it again.
|
||||
return
|
||||
}
|
||||
|
||||
let view = OnboardingTransferProgressViewController(onboardingController: self, progress: progress)
|
||||
let view = Deprecated_OnboardingTransferProgressViewController(onboardingController: self, progress: progress)
|
||||
navigationController.pushViewController(view, animated: true)
|
||||
}
|
||||
|
||||
@ -571,12 +571,12 @@ public class OnboardingController: NSObject {
|
||||
return
|
||||
}
|
||||
|
||||
guard !(navigationController.topViewController is OnboardingTransferChoiceViewController) else {
|
||||
guard !(navigationController.topViewController is Deprecated_OnboardingTransferChoiceViewController) else {
|
||||
// transfer view is already presented, we don't need to push it again.
|
||||
return
|
||||
}
|
||||
|
||||
let view = OnboardingTransferChoiceViewController(onboardingController: self)
|
||||
let view = Deprecated_OnboardingTransferChoiceViewController(onboardingController: self)
|
||||
navigationController.pushViewController(view, animated: true)
|
||||
}
|
||||
|
||||
@ -812,7 +812,7 @@ public extension UIView {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension OnboardingController: RegistrationHelperDelegate {
|
||||
extension Deprecated_OnboardingController: Deprecated_RegistrationHelperDelegate {
|
||||
public func registrationRequestVerificationDidSucceed(fromViewController: UIViewController) {
|
||||
requestingVerificationDidSucceed(viewController: fromViewController)
|
||||
}
|
||||
@ -828,9 +828,9 @@ extension OnboardingController: RegistrationHelperDelegate {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension OnboardingController: RegistrationPinAttemptsExhaustedViewDelegate {
|
||||
extension Deprecated_OnboardingController: Deprecated_RegistrationPinAttemptsExhaustedViewDelegate {
|
||||
|
||||
func pinAttemptsExhaustedViewDidComplete(viewController: RegistrationPinAttemptsExhaustedViewController) {
|
||||
func pinAttemptsExhaustedViewDidComplete(viewController: Deprecated_RegistrationPinAttemptsExhaustedViewController) {
|
||||
guard let navigationController = viewController.navigationController else {
|
||||
owsFailDebug("Missing navigationController")
|
||||
return
|
||||
@ -6,7 +6,7 @@
|
||||
import Foundation
|
||||
import SignalMessaging
|
||||
|
||||
class OnboardingModeSwitchConfirmationViewController: OnboardingBaseViewController {
|
||||
class Deprecated_OnboardingModeSwitchConfirmationViewController: Deprecated_OnboardingBaseViewController {
|
||||
var warningText: String?
|
||||
|
||||
override func loadView() {
|
||||
@ -21,7 +21,7 @@ class OnboardingModeSwitchConfirmationViewController: OnboardingBaseViewControll
|
||||
let nextButtonText: String
|
||||
let image: UIImage?
|
||||
|
||||
switch OnboardingController.defaultOnboardingMode {
|
||||
switch Deprecated_OnboardingController.defaultOnboardingMode {
|
||||
case .registering:
|
||||
titleText = NSLocalizedString("ONBOARDING_MODE_SWITCH_TITLE_REGISTERING",
|
||||
comment: "header text indicating to the user they're switching from registering to linking flow")
|
||||
@ -57,7 +57,7 @@ class OnboardingModeSwitchConfirmationViewController: OnboardingBaseViewControll
|
||||
let nextButton = self.primaryButton(title: nextButtonText,
|
||||
selector: #selector(didPressNext))
|
||||
nextButton.accessibilityIdentifier = "onboarding.modeSwitch.nextButton"
|
||||
let primaryButtonView = OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
let primaryButtonView = Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
|
||||
let topSpacer = UIView.vStretchingSpacer(minHeight: 12)
|
||||
let bottomSpacer = UIView.vStretchingSpacer(minHeight: 12)
|
||||
@ -9,13 +9,13 @@ import SignalMessaging
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
public class OnboardingPermissionsViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_OnboardingPermissionsViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
private let animationView = AnimationView(name: "notificationPermission")
|
||||
|
||||
let shouldRequestAccessToContacts: Bool
|
||||
|
||||
override public init(onboardingController: OnboardingController) {
|
||||
override public init(onboardingController: Deprecated_OnboardingController) {
|
||||
switch onboardingController.onboardingMode {
|
||||
case .registering: // primary
|
||||
shouldRequestAccessToContacts = true
|
||||
@ -87,7 +87,7 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController {
|
||||
UIView.spacer(withHeight: 60),
|
||||
animationView,
|
||||
UIView.vStretchingSpacer(minHeight: 80),
|
||||
OnboardingBaseViewController.horizontallyWrap(primaryButton: giveAccessButton)
|
||||
Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: giveAccessButton)
|
||||
])
|
||||
stackView.axis = .vertical
|
||||
stackView.alignment = .fill
|
||||
@ -7,7 +7,7 @@ import Foundation
|
||||
import SignalMessaging
|
||||
|
||||
@objc
|
||||
public class OnboardingProfileCreationViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_OnboardingProfileCreationViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
@ -403,7 +403,7 @@ public class OnboardingProfileCreationViewController: OnboardingBaseViewControll
|
||||
|
||||
// MARK: - <UITextFieldDelegate>
|
||||
|
||||
extension OnboardingProfileCreationViewController: UITextFieldDelegate {
|
||||
extension Deprecated_OnboardingProfileCreationViewController: UITextFieldDelegate {
|
||||
|
||||
public func textField(_ textField: UITextField,
|
||||
shouldChangeCharactersIn range: NSRange,
|
||||
@ -9,7 +9,7 @@ import SignalServiceKit
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
public class OnboardingSplashViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_OnboardingSplashViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
let modeSwitchButton = UIButton()
|
||||
|
||||
@ -28,7 +28,7 @@ public class OnboardingSplashViewController: OnboardingBaseViewController {
|
||||
|
||||
view.addSubview(modeSwitchButton)
|
||||
modeSwitchButton.setTemplateImageName(
|
||||
OnboardingController.defaultOnboardingMode == .registering ? "link-24" : "link-broken-24",
|
||||
Deprecated_OnboardingController.defaultOnboardingMode == .registering ? "link-24" : "link-broken-24",
|
||||
tintColor: .ows_gray25
|
||||
)
|
||||
modeSwitchButton.autoSetDimensions(to: CGSize(square: 40))
|
||||
@ -73,7 +73,7 @@ public class OnboardingSplashViewController: OnboardingBaseViewController {
|
||||
let continueButton = self.primaryButton(title: CommonStrings.continueButton,
|
||||
selector: #selector(continuePressed))
|
||||
continueButton.accessibilityIdentifier = "onboarding.splash." + "continueButton"
|
||||
let primaryButtonView = OnboardingBaseViewController.horizontallyWrap(primaryButton: continueButton)
|
||||
let primaryButtonView = Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: continueButton)
|
||||
|
||||
let stackView = UIStackView(arrangedSubviews: [
|
||||
heroImageView,
|
||||
@ -97,7 +97,7 @@ public class OnboardingSplashViewController: OnboardingBaseViewController {
|
||||
// Whenever this view appears, we should switch back to the default
|
||||
// registration mode. If the user wants to use the other one, they need to
|
||||
// tap the link icon and confirm their selection.
|
||||
onboardingController.onboardingMode = OnboardingController.defaultOnboardingMode
|
||||
onboardingController.onboardingMode = Deprecated_OnboardingController.defaultOnboardingMode
|
||||
}
|
||||
|
||||
// MARK: - Events
|
||||
@ -8,9 +8,9 @@ import SignalCoreKit
|
||||
|
||||
// Most of the logic for the verification views resides in RegistrationVerificationViewController.
|
||||
@objc
|
||||
public class OnboardingVerificationViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_OnboardingVerificationViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
let viewModel = RegistrationVerificationViewModel()
|
||||
let viewModel = Deprecated_RegistrationVerificationViewModel()
|
||||
|
||||
override public func loadView() {
|
||||
viewModel.viewController = self
|
||||
@ -25,7 +25,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController
|
||||
|
||||
// MARK: - View Lifecycle
|
||||
|
||||
public override init(onboardingController: OnboardingController) {
|
||||
public override init(onboardingController: Deprecated_OnboardingController) {
|
||||
super.init(onboardingController: onboardingController)
|
||||
|
||||
keyboardObservationBehavior = .whileLifecycleVisible
|
||||
@ -62,7 +62,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension OnboardingVerificationViewController: RegistrationVerificationViewController {
|
||||
extension Deprecated_OnboardingVerificationViewController: Deprecated_RegistrationVerificationViewController {
|
||||
var phoneNumberE164: String? {
|
||||
onboardingController.phoneNumber?.e164
|
||||
}
|
||||
@ -111,7 +111,7 @@ extension OnboardingVerificationViewController: RegistrationVerificationViewCont
|
||||
|
||||
Logger.info("")
|
||||
let phoneNumberVC = navigationController?.viewControllers
|
||||
.filter { $0 is RegistrationPhoneNumberViewController }.last
|
||||
.filter { $0 is Deprecated_RegistrationPhoneNumberViewController }.last
|
||||
|
||||
if let phoneNumberVC = phoneNumberVC {
|
||||
self.navigationController?.popToViewController(phoneNumberVC, animated: true)
|
||||
@ -7,7 +7,7 @@ import SignalMessaging
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
public class RegistrationPhoneNumberDiscoverabilityViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_RegistrationPhoneNumberDiscoverabilityViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
static let hInset: CGFloat = UIDevice.current.isPlusSizePhone ? 20 : 16
|
||||
|
||||
@ -104,7 +104,7 @@ public class RegistrationPhoneNumberDiscoverabilityViewController: OnboardingBas
|
||||
let nextButton = self.primaryButton(title: CommonStrings.nextButton,
|
||||
selector: #selector(nextPressed))
|
||||
nextButton.accessibilityIdentifier = "onboarding.phoneNumberDiscoverability." + "nextButton"
|
||||
let primaryButtonView = OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
let primaryButtonView = Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
|
||||
let compressableBottomMargin = UIView.vStretchingSpacer(minHeight: 16, maxHeight: primaryLayoutMargins.bottom)
|
||||
|
||||
@ -158,7 +158,7 @@ private class ButtonRow: UIButton {
|
||||
private let selectedImageView = UIImageView()
|
||||
|
||||
static let vInset: CGFloat = 11
|
||||
static var hInset: CGFloat { RegistrationPhoneNumberDiscoverabilityViewController.hInset }
|
||||
static var hInset: CGFloat { Deprecated_RegistrationPhoneNumberDiscoverabilityViewController.hInset }
|
||||
|
||||
override var isSelected: Bool {
|
||||
didSet {
|
||||
@ -7,7 +7,7 @@ import SignalMessaging
|
||||
import UIKit
|
||||
|
||||
@objc
|
||||
public class RegistrationPhoneNumberViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_RegistrationPhoneNumberViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
// MARK: - Properties
|
||||
|
||||
@ -212,7 +212,7 @@ public class RegistrationPhoneNumberViewController: OnboardingBaseViewController
|
||||
titleLabel, titleSpacer,
|
||||
countryRow, phoneNumberRow, phoneNumberSpacer,
|
||||
validationWarningLabel, warningLabelSpacer,
|
||||
OnboardingBaseViewController.horizontallyWrap(primaryButton: continueButton), bottomSpacer
|
||||
Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: continueButton), bottomSpacer
|
||||
])
|
||||
stackView.axis = .vertical
|
||||
stackView.alignment = .fill
|
||||
@ -343,7 +343,7 @@ public class RegistrationPhoneNumberViewController: OnboardingBaseViewController
|
||||
phoneNumber = reregistrationNumber
|
||||
isReregistering = true
|
||||
|
||||
} else if let lastRegisteredPhoneNumber = OnboardingController.lastRegisteredPhoneNumber(),
|
||||
} else if let lastRegisteredPhoneNumber = Deprecated_OnboardingController.lastRegisteredPhoneNumber(),
|
||||
!lastRegisteredPhoneNumber.isEmpty {
|
||||
phoneNumber = lastRegisteredPhoneNumber
|
||||
|
||||
@ -653,7 +653,7 @@ public class RegistrationPhoneNumberViewController: OnboardingBaseViewController
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension RegistrationPhoneNumberViewController: UITextFieldDelegate {
|
||||
extension Deprecated_RegistrationPhoneNumberViewController: UITextFieldDelegate {
|
||||
public func textField(
|
||||
_ textField: UITextField,
|
||||
shouldChangeCharactersIn range: NSRange,
|
||||
@ -685,7 +685,7 @@ extension RegistrationPhoneNumberViewController: UITextFieldDelegate {
|
||||
|
||||
// MARK: -
|
||||
|
||||
extension RegistrationPhoneNumberViewController: CountryCodeViewControllerDelegate {
|
||||
extension Deprecated_RegistrationPhoneNumberViewController: CountryCodeViewControllerDelegate {
|
||||
public func countryCodeViewController(_ vc: CountryCodeViewController,
|
||||
didSelectCountry countryState: RegistrationCountryState) {
|
||||
onboardingController.update(countryState: countryState)
|
||||
@ -8,9 +8,9 @@ import SignalMessaging
|
||||
import SignalServiceKit
|
||||
|
||||
@objc
|
||||
public class ProvisioningController: NSObject {
|
||||
public class Deprecated_ProvisioningController: NSObject {
|
||||
|
||||
let onboardingController: OnboardingController
|
||||
let onboardingController: Deprecated_OnboardingController
|
||||
|
||||
private let provisioningCipher: ProvisioningCipher
|
||||
private let provisioningSocket: ProvisioningSocket
|
||||
@ -21,7 +21,7 @@ public class ProvisioningController: NSObject {
|
||||
private var provisionEnvelopePromise: Promise<ProvisioningProtoProvisionEnvelope>
|
||||
private var provisionEnvelopeFuture: Future<ProvisioningProtoProvisionEnvelope>
|
||||
|
||||
public init(onboardingController: OnboardingController) {
|
||||
public init(onboardingController: Deprecated_OnboardingController) {
|
||||
self.onboardingController = onboardingController
|
||||
provisioningCipher = ProvisioningCipher.generate()
|
||||
|
||||
@ -45,11 +45,11 @@ public class ProvisioningController: NSObject {
|
||||
public static func presentRelinkingFlow() {
|
||||
// TODO[ViewContextPiping]
|
||||
let context = ViewControllerContext.shared
|
||||
let onboardingController = OnboardingController(context: context, onboardingMode: .provisioning)
|
||||
let navController = OnboardingNavigationController(onboardingController: onboardingController)
|
||||
let onboardingController = Deprecated_OnboardingController(context: context, onboardingMode: .provisioning)
|
||||
let navController = Deprecated_OnboardingNavigationController(onboardingController: onboardingController)
|
||||
|
||||
let provisioningController = ProvisioningController(onboardingController: onboardingController)
|
||||
let vc = SecondaryLinkingQRCodeViewController(provisioningController: provisioningController)
|
||||
let provisioningController = Deprecated_ProvisioningController(onboardingController: onboardingController)
|
||||
let vc = Deprecated_SecondaryLinkingQRCodeViewController(provisioningController: provisioningController)
|
||||
navController.setViewControllers([vc], animated: false)
|
||||
|
||||
provisioningController.awaitProvisioning(from: vc, navigationController: navController)
|
||||
@ -58,19 +58,19 @@ public class ProvisioningController: NSObject {
|
||||
|
||||
// MARK: -
|
||||
|
||||
func didConfirmSecondaryDevice(from viewController: SecondaryLinkingPrepViewController) {
|
||||
func didConfirmSecondaryDevice(from viewController: Deprecated_SecondaryLinkingPrepViewController) {
|
||||
guard let navigationController = viewController.navigationController else {
|
||||
owsFailDebug("navigationController was unexpectedly nil")
|
||||
return
|
||||
}
|
||||
|
||||
let qrCodeViewController = SecondaryLinkingQRCodeViewController(provisioningController: self)
|
||||
let qrCodeViewController = Deprecated_SecondaryLinkingQRCodeViewController(provisioningController: self)
|
||||
navigationController.pushViewController(qrCodeViewController, animated: true)
|
||||
|
||||
awaitProvisioning(from: qrCodeViewController, navigationController: navigationController)
|
||||
}
|
||||
|
||||
private func awaitProvisioning(from viewController: SecondaryLinkingQRCodeViewController,
|
||||
private func awaitProvisioning(from viewController: Deprecated_SecondaryLinkingQRCodeViewController,
|
||||
navigationController: UINavigationController) {
|
||||
|
||||
awaitProvisionMessage.done { [weak self, weak navigationController] message in
|
||||
@ -95,7 +95,7 @@ public class ProvisioningController: NSObject {
|
||||
return
|
||||
}
|
||||
|
||||
let confirmVC = SecondaryLinkingSetDeviceNameViewController(provisioningController: self)
|
||||
let confirmVC = Deprecated_SecondaryLinkingSetDeviceNameViewController(provisioningController: self)
|
||||
navigationController.pushViewController(confirmVC, animated: true)
|
||||
}.catch { error in
|
||||
switch error {
|
||||
@ -245,7 +245,7 @@ public class ProvisioningController: NSObject {
|
||||
}
|
||||
}
|
||||
|
||||
extension ProvisioningController: ProvisioningSocketDelegate {
|
||||
extension Deprecated_ProvisioningController: ProvisioningSocketDelegate {
|
||||
public func provisioningSocket(_ provisioningSocket: ProvisioningSocket, didReceiveDeviceId deviceId: String) {
|
||||
owsAssertDebug(!deviceIdPromise.isSealed)
|
||||
deviceIdFuture.resolve(deviceId)
|
||||
@ -8,12 +8,12 @@ import Lottie
|
||||
import SignalMessaging
|
||||
|
||||
@objc
|
||||
public class SecondaryLinkingPrepViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_SecondaryLinkingPrepViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
lazy var animationView = AnimationView(name: isTransferring ? "launchApp-iPad" : "launchApp-iPhone")
|
||||
let isTransferring: Bool
|
||||
|
||||
public init(onboardingController: OnboardingController, isTransferring: Bool) {
|
||||
public init(onboardingController: Deprecated_OnboardingController, isTransferring: Bool) {
|
||||
self.isTransferring = isTransferring
|
||||
super.init(onboardingController: onboardingController)
|
||||
}
|
||||
@ -60,7 +60,7 @@ public class SecondaryLinkingPrepViewController: OnboardingBaseViewController {
|
||||
let nextButton = self.primaryButton(title: CommonStrings.nextButton,
|
||||
selector: #selector(didPressNext))
|
||||
nextButton.accessibilityIdentifier = "onboarding.prelink.nextButton"
|
||||
let primaryButtonView = OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
let primaryButtonView = Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: nextButton)
|
||||
|
||||
let stackView = UIStackView(arrangedSubviews: [
|
||||
titleLabel,
|
||||
@ -114,7 +114,7 @@ public class SecondaryLinkingPrepViewController: OnboardingBaseViewController {
|
||||
if isTransferring {
|
||||
onboardingController.transferAccount(fromViewController: self)
|
||||
} else {
|
||||
let provisioningController = ProvisioningController(onboardingController: onboardingController)
|
||||
let provisioningController = Deprecated_ProvisioningController(onboardingController: onboardingController)
|
||||
provisioningController.didConfirmSecondaryDevice(from: self)
|
||||
}
|
||||
}
|
||||
@ -8,11 +8,11 @@ import SafariServices
|
||||
import SignalMessaging
|
||||
|
||||
@objc
|
||||
public class SecondaryLinkingQRCodeViewController: OnboardingBaseViewController {
|
||||
public class Deprecated_SecondaryLinkingQRCodeViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
let provisioningController: ProvisioningController
|
||||
let provisioningController: Deprecated_ProvisioningController
|
||||
|
||||
required init(provisioningController: ProvisioningController) {
|
||||
required init(provisioningController: Deprecated_ProvisioningController) {
|
||||
self.provisioningController = provisioningController
|
||||
super.init(onboardingController: provisioningController.onboardingController)
|
||||
}
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
import Foundation
|
||||
|
||||
class SecondaryLinkingSetDeviceNameViewController: OnboardingBaseViewController {
|
||||
class Deprecated_SecondaryLinkingSetDeviceNameViewController: Deprecated_OnboardingBaseViewController {
|
||||
|
||||
let provisioningController: ProvisioningController
|
||||
let provisioningController: Deprecated_ProvisioningController
|
||||
|
||||
init(provisioningController: ProvisioningController) {
|
||||
init(provisioningController: Deprecated_ProvisioningController) {
|
||||
self.provisioningController = provisioningController
|
||||
super.init(onboardingController: provisioningController.onboardingController)
|
||||
}
|
||||
@ -60,7 +60,7 @@ class SecondaryLinkingSetDeviceNameViewController: OnboardingBaseViewController
|
||||
let primaryButton = self.primaryButton(title: NSLocalizedString("SECONDARY_ONBOARDING_COMPLETE_LINKING_PROCESS", comment: "body text while displaying a QR code which, when scanned, will link this device."),
|
||||
selector: #selector(didTapFinalizeLinking))
|
||||
primaryButton.accessibilityIdentifier = "onboarding.confirmLink.confirmButton"
|
||||
let primaryButtonView = OnboardingBaseViewController.horizontallyWrap(primaryButton: primaryButton)
|
||||
let primaryButtonView = Deprecated_OnboardingBaseViewController.horizontallyWrap(primaryButton: primaryButton)
|
||||
|
||||
let aboveTextFieldSpacer = UIView.vStretchingSpacer(maxHeight: 60)
|
||||
let belowTextFieldSpacer = UIView.vStretchingSpacer()
|
||||
@ -8,7 +8,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class ConversationSplitViewController;
|
||||
@class OnboardingController;
|
||||
@class Deprecated_OnboardingController;
|
||||
@class SignalServiceAddress;
|
||||
@class TSThread;
|
||||
|
||||
@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
+ (void)resetAppData;
|
||||
+ (void)resetAppDataWithUI;
|
||||
|
||||
- (void)showOnboardingView:(OnboardingController *)onboardingController;
|
||||
- (void)showOnboardingView:(Deprecated_OnboardingController *)onboardingController;
|
||||
- (void)showConversationSplitView;
|
||||
- (void)applicationWillTerminate;
|
||||
|
||||
|
||||
@ -274,10 +274,10 @@ NSString *const kNSUserDefaults_DidTerminateKey = @"kNSUserDefaults_DidTerminate
|
||||
self.conversationSplitViewController = splitViewController;
|
||||
}
|
||||
|
||||
- (void)showOnboardingView:(OnboardingController *)onboardingController
|
||||
- (void)showOnboardingView:(Deprecated_OnboardingController *)onboardingController
|
||||
{
|
||||
OnboardingNavigationController *navController =
|
||||
[[OnboardingNavigationController alloc] initWithOnboardingController:onboardingController];
|
||||
Deprecated_OnboardingNavigationController *navController =
|
||||
[[Deprecated_OnboardingNavigationController alloc] initWithOnboardingController:onboardingController];
|
||||
|
||||
UITapGestureRecognizer *submitLogGesture =
|
||||
[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(submitOnboardingLogs)];
|
||||
|
||||
@ -52,7 +52,7 @@ extension SignalApp {
|
||||
let startupDuration = CACurrentMediaTime() - launchStartedAt
|
||||
Logger.info("Presenting app \(startupDuration) seconds after launch started.")
|
||||
|
||||
let onboardingController = OnboardingController()
|
||||
let onboardingController = Deprecated_OnboardingController()
|
||||
if onboardingController.isComplete {
|
||||
onboardingController.markAsOnboarded()
|
||||
showConversationSplitView()
|
||||
|
||||
@ -120,7 +120,7 @@ class AppUpdateNag: NSObject {
|
||||
}
|
||||
|
||||
switch frontmostViewController {
|
||||
case is ConversationSplitViewController, is OnboardingSplashViewController:
|
||||
case is ConversationSplitViewController, is Deprecated_OnboardingSplashViewController:
|
||||
self.setLastNagDate(Date())
|
||||
self.clearFirstHeardOfNewVersionDate()
|
||||
presentUpgradeNag(appStoreRecord: appStoreRecord)
|
||||
|
||||
@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
[Environment.shared.preferences unsetRecordedAPNSTokens];
|
||||
|
||||
[ProvisioningController presentRelinkingFlow];
|
||||
[Deprecated_ProvisioningController presentRelinkingFlow];
|
||||
}
|
||||
|
||||
+ (void)showReregistrationUIFromViewController:(UIViewController *)fromViewController
|
||||
|
||||
@ -34,9 +34,9 @@ public extension RegistrationUtils {
|
||||
canCancel: false) { modalActivityIndicator in
|
||||
|
||||
firstly {
|
||||
Self.accountManager.requestRegistrationVerification(e164: phoneNumber,
|
||||
captchaToken: nil,
|
||||
isSMS: true)
|
||||
Self.accountManager.deprecated_requestRegistrationVerification(e164: phoneNumber,
|
||||
captchaToken: nil,
|
||||
isSMS: true)
|
||||
}.done(on: .main) { _ in
|
||||
|
||||
Logger.info("re-registering: send verification code succeeded.")
|
||||
@ -46,13 +46,13 @@ public extension RegistrationUtils {
|
||||
|
||||
// TODO[ViewContextPiping]
|
||||
let context = ViewControllerContext.shared
|
||||
let onboardingController = OnboardingController(context: context, onboardingMode: .registering)
|
||||
let onboardingController = Deprecated_OnboardingController(context: context, onboardingMode: .registering)
|
||||
let registrationPhoneNumber = RegistrationPhoneNumber(e164: phoneNumber, userInput: phoneNumber)
|
||||
onboardingController.update(phoneNumber: registrationPhoneNumber)
|
||||
|
||||
let viewController = OnboardingVerificationViewController(onboardingController: onboardingController)
|
||||
let viewController = Deprecated_OnboardingVerificationViewController(onboardingController: onboardingController)
|
||||
viewController.hideBackLink()
|
||||
let navigationController = OnboardingNavigationController(onboardingController: onboardingController)
|
||||
let navigationController = Deprecated_OnboardingNavigationController(onboardingController: onboardingController)
|
||||
navigationController.setViewControllers([viewController], animated: false)
|
||||
let window: UIWindow = CurrentAppContext().mainWindow!
|
||||
window.rootViewController = navigationController
|
||||
@ -80,12 +80,12 @@ public extension RegistrationUtils {
|
||||
case .captchaRequired:
|
||||
// TODO[ViewContextPiping]
|
||||
let context = ViewControllerContext.shared
|
||||
let onboardingController = OnboardingController(context: context, onboardingMode: .registering)
|
||||
let onboardingController = Deprecated_OnboardingController(context: context, onboardingMode: .registering)
|
||||
let registrationPhoneNumber = RegistrationPhoneNumber(e164: phoneNumber, userInput: phoneNumber)
|
||||
onboardingController.update(phoneNumber: registrationPhoneNumber)
|
||||
|
||||
let viewController = OnboardingCaptchaViewController(onboardingController: onboardingController)
|
||||
let navigationController = OnboardingNavigationController(onboardingController: onboardingController)
|
||||
let viewController = Deprecated_OnboardingCaptchaViewController(onboardingController: onboardingController)
|
||||
let navigationController = Deprecated_OnboardingNavigationController(onboardingController: onboardingController)
|
||||
navigationController.setViewControllers([viewController], animated: false)
|
||||
let window: UIWindow = CurrentAppContext().mainWindow!
|
||||
window.rootViewController = navigationController
|
||||
|
||||
@ -18,12 +18,12 @@ public class AccountServiceClient: NSObject {
|
||||
|
||||
// MARK: - Public
|
||||
|
||||
public func requestPreauthChallenge(e164: String, pushToken: String, isVoipToken: Bool) -> Promise<Void> {
|
||||
serviceClient.requestPreauthChallenge(e164: e164, pushToken: pushToken, isVoipToken: isVoipToken)
|
||||
public func deprecated_requestPreauthChallenge(e164: String, pushToken: String, isVoipToken: Bool) -> Promise<Void> {
|
||||
serviceClient.deprecated_requestPreauthChallenge(e164: e164, pushToken: pushToken, isVoipToken: isVoipToken)
|
||||
}
|
||||
|
||||
public func requestVerificationCode(e164: String, preauthChallenge: String?, captchaToken: String?, transport: TSVerificationTransport) -> Promise<Void> {
|
||||
serviceClient.requestVerificationCode(e164: e164,
|
||||
public func deprecated_requestVerificationCode(e164: String, preauthChallenge: String?, captchaToken: String?, transport: TSVerificationTransport) -> Promise<Void> {
|
||||
serviceClient.deprecated_requestVerificationCode(e164: e164,
|
||||
preauthChallenge: preauthChallenge,
|
||||
captchaToken: captchaToken,
|
||||
transport: transport).recover { error -> Void in
|
||||
|
||||
@ -27,7 +27,7 @@ public extension OWSRequestFactory {
|
||||
|
||||
// MARK: - Registration
|
||||
|
||||
static func requestPreauthChallenge(
|
||||
static func deprecated_requestPreauthChallenge(
|
||||
e164: String,
|
||||
pushToken: String,
|
||||
isVoipToken: Bool
|
||||
|
||||
@ -13,8 +13,8 @@ public enum SignalServiceError: Int, Error {
|
||||
// MARK: -
|
||||
|
||||
public protocol SignalServiceClient {
|
||||
func requestPreauthChallenge(e164: String, pushToken: String, isVoipToken: Bool) -> Promise<Void>
|
||||
func requestVerificationCode(e164: String, preauthChallenge: String?, captchaToken: String?, transport: TSVerificationTransport) -> Promise<Void>
|
||||
func deprecated_requestPreauthChallenge(e164: String, pushToken: String, isVoipToken: Bool) -> Promise<Void>
|
||||
func deprecated_requestVerificationCode(e164: String, preauthChallenge: String?, captchaToken: String?, transport: TSVerificationTransport) -> Promise<Void>
|
||||
func verifySecondaryDevice(verificationCode: String, phoneNumber: String, authKey: String, encryptedDeviceName: Data) -> Promise<VerifySecondaryDeviceResponse>
|
||||
func getAvailablePreKeys(for identity: OWSIdentity) -> Promise<Int>
|
||||
func registerPreKeys(for identity: OWSIdentity, identityKey: IdentityKey, signedPreKeyRecord: SignedPreKeyRecord, preKeyRecords: [PreKeyRecord]) -> Promise<Void>
|
||||
@ -47,8 +47,8 @@ public class SignalServiceRestClient: NSObject, SignalServiceClient {
|
||||
|
||||
// MARK: - Public
|
||||
|
||||
public func requestPreauthChallenge(e164: String, pushToken: String, isVoipToken: Bool) -> Promise<Void> {
|
||||
let request = OWSRequestFactory.requestPreauthChallenge(
|
||||
public func deprecated_requestPreauthChallenge(e164: String, pushToken: String, isVoipToken: Bool) -> Promise<Void> {
|
||||
let request = OWSRequestFactory.deprecated_requestPreauthChallenge(
|
||||
e164: e164,
|
||||
pushToken: pushToken,
|
||||
isVoipToken: isVoipToken
|
||||
@ -56,7 +56,7 @@ public class SignalServiceRestClient: NSObject, SignalServiceClient {
|
||||
return networkManager.makePromise(request: request).asVoid()
|
||||
}
|
||||
|
||||
public func requestVerificationCode(e164: String, preauthChallenge: String?, captchaToken: String?, transport: TSVerificationTransport) -> Promise<Void> {
|
||||
public func deprecated_requestVerificationCode(e164: String, preauthChallenge: String?, captchaToken: String?, transport: TSVerificationTransport) -> Promise<Void> {
|
||||
let request = OWSRequestFactory.requestVerificationCodeRequest(e164: e164,
|
||||
preauthChallenge: preauthChallenge,
|
||||
captchaToken: captchaToken,
|
||||
|
||||
@ -12,11 +12,11 @@ public class FakeAccountServiceClient: AccountServiceClient {
|
||||
|
||||
// MARK: - Public
|
||||
|
||||
public override func requestPreauthChallenge(e164: String, pushToken: String, isVoipToken: Bool) -> Promise<Void> {
|
||||
public override func deprecated_requestPreauthChallenge(e164: String, pushToken: String, isVoipToken: Bool) -> Promise<Void> {
|
||||
return Promise { $0.resolve() }
|
||||
}
|
||||
|
||||
public override func requestVerificationCode(e164: String, preauthChallenge: String?, captchaToken: String?, transport: TSVerificationTransport) -> Promise<Void> {
|
||||
public override func deprecated_requestVerificationCode(e164: String, preauthChallenge: String?, captchaToken: String?, transport: TSVerificationTransport) -> Promise<Void> {
|
||||
return Promise { $0.resolve() }
|
||||
}
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ class OWSRequestFactoryTest: SSKBaseTestSwift {
|
||||
// MARK: - Account
|
||||
|
||||
func testRequestPreauthChallenge() {
|
||||
let request = OWSRequestFactory.requestPreauthChallenge(
|
||||
let request = OWSRequestFactory.deprecated_requestPreauthChallenge(
|
||||
e164: "+19875550165",
|
||||
pushToken: "foo bar",
|
||||
isVoipToken: true
|
||||
|
||||
Loading…
Reference in New Issue
Block a user