pull/354/head
Niels Andriesse 3 years ago
parent 10e6d114a0
commit c5c6bf2624

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

@ -125,13 +125,13 @@ final class LinkDeviceVC : BaseVC, UIPageViewControllerDataSource, UIPageViewCon
let (ed25519KeyPair, x25519KeyPair) = KeyPairUtilities.generate(from: seed) let (ed25519KeyPair, x25519KeyPair) = KeyPairUtilities.generate(from: seed)
Onboarding.Flow.link.preregister(with: seed, ed25519KeyPair: ed25519KeyPair, x25519KeyPair: x25519KeyPair) Onboarding.Flow.link.preregister(with: seed, ed25519KeyPair: ed25519KeyPair, x25519KeyPair: x25519KeyPair)
TSAccountManager.sharedInstance().didRegister() 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 ModalActivityIndicatorViewController.present(fromViewController: navigationController!) { [weak self] modal in
self?.activityIndicatorModal = modal self?.activityIndicatorModal = modal
} }
} }
@objc private func handleConfigurationMessageReceived(_ notification: Notification) { @objc private func handleInitialConfigurationMessageReceived(_ notification: Notification) {
TSAccountManager.sharedInstance().phoneNumberAwaitingVerification = OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey TSAccountManager.sharedInstance().phoneNumberAwaitingVerification = OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey
DispatchQueue.main.async { DispatchQueue.main.async {
self.navigationController!.dismiss(animated: true) { self.navigationController!.dismiss(animated: true) {

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

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

Loading…
Cancel
Save