This commit is contained in:
Niels Andriesse 2021-02-23 16:09:22 +11:00
parent 10e6d114a0
commit c5c6bf2624
4 changed files with 9 additions and 10 deletions

View File

@ -59,10 +59,10 @@ final class LandingVC : BaseVC {
// Link button container
let linkButtonContainer = UIView()
linkButtonContainer.set(.height, to: Values.onboardingButtonBottomOffset)
// linkButtonContainer.addSubview(linkButton)
// linkButton.center(.horizontal, in: linkButtonContainer)
// let isIPhoneX = (UIApplication.shared.keyWindow!.safeAreaInsets.bottom > 0)
// linkButton.centerYAnchor.constraint(equalTo: linkButtonContainer.centerYAnchor, constant: isIPhoneX ? -4 : 0).isActive = true
linkButtonContainer.addSubview(linkButton)
linkButton.center(.horizontal, in: linkButtonContainer)
let isIPhoneX = (UIApplication.shared.keyWindow!.safeAreaInsets.bottom > 0)
linkButton.centerYAnchor.constraint(equalTo: linkButtonContainer.centerYAnchor, constant: isIPhoneX ? -4 : 0).isActive = true
// Button stack view
let buttonStackView = UIStackView(arrangedSubviews: [ registerButton, restoreButton ])
buttonStackView.axis = .vertical

View File

@ -125,13 +125,13 @@ final class LinkDeviceVC : BaseVC, UIPageViewControllerDataSource, UIPageViewCon
let (ed25519KeyPair, x25519KeyPair) = KeyPairUtilities.generate(from: seed)
Onboarding.Flow.link.preregister(with: seed, ed25519KeyPair: ed25519KeyPair, x25519KeyPair: x25519KeyPair)
TSAccountManager.sharedInstance().didRegister()
NotificationCenter.default.addObserver(self, selector: #selector(handleConfigurationMessageReceived), name: .configurationMessageReceived, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(handleInitialConfigurationMessageReceived), name: .initialConfigurationMessageReceived, object: nil)
ModalActivityIndicatorViewController.present(fromViewController: navigationController!) { [weak self] modal in
self?.activityIndicatorModal = modal
}
}
@objc private func handleConfigurationMessageReceived(_ notification: Notification) {
@objc private func handleInitialConfigurationMessageReceived(_ notification: Notification) {
TSAccountManager.sharedInstance().phoneNumberAwaitingVerification = OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey
DispatchQueue.main.async {
self.navigationController!.dismiss(animated: true) {

View File

@ -168,11 +168,10 @@ extension MessageReceiver {
transaction.addCompletionQueue(DispatchQueue.main) {
SSKEnvironment.shared.profileManager.downloadAvatar(for: userProfile)
}
// Notification
NotificationCenter.default.post(name: .configurationMessageReceived, object: nil)
// Initial configuration sync
if !UserDefaults.standard[.hasSyncedInitialConfiguration] {
UserDefaults.standard[.hasSyncedInitialConfiguration] = true
NotificationCenter.default.post(name: .initialConfigurationMessageReceived, object: nil)
// Closed groups
let allClosedGroupPublicKeys = storage.getUserClosedGroupPublicKeys()
for closedGroup in message.closedGroups {

View File

@ -1,10 +1,10 @@
public extension Notification.Name {
static let configurationMessageReceived = Notification.Name("configurationMessageReceived")
static let initialConfigurationMessageReceived = Notification.Name("initialConfigurationMessageReceived")
}
@objc public extension NSNotification {
@objc static let configurationMessageReceived = Notification.Name.configurationMessageReceived.rawValue as NSString
@objc static let initialConfigurationMessageReceived = Notification.Name.initialConfigurationMessageReceived.rawValue as NSString
}