From c5c6bf262414c633c2496bc3ea94f7564fc3caa6 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 23 Feb 2021 16:09:22 +1100 Subject: [PATCH] Debug --- Session/Onboarding/LandingVC.swift | 8 ++++---- Session/Onboarding/LinkDeviceVC.swift | 4 ++-- .../Sending & Receiving/MessageReceiver+Handling.swift | 3 +-- .../Notification+MessageReceiver.swift | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Session/Onboarding/LandingVC.swift b/Session/Onboarding/LandingVC.swift index 687880276..92b98d771 100644 --- a/Session/Onboarding/LandingVC.swift +++ b/Session/Onboarding/LandingVC.swift @@ -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 diff --git a/Session/Onboarding/LinkDeviceVC.swift b/Session/Onboarding/LinkDeviceVC.swift index 585b118c5..4fa74b490 100644 --- a/Session/Onboarding/LinkDeviceVC.swift +++ b/Session/Onboarding/LinkDeviceVC.swift @@ -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) { diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift index 24b102198..0e4051051 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift @@ -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 { diff --git a/SessionMessagingKit/Sending & Receiving/Notification+MessageReceiver.swift b/SessionMessagingKit/Sending & Receiving/Notification+MessageReceiver.swift index 8b3c079d9..87cdcfd51 100644 --- a/SessionMessagingKit/Sending & Receiving/Notification+MessageReceiver.swift +++ b/SessionMessagingKit/Sending & Receiving/Notification+MessageReceiver.swift @@ -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 }