From e6afbe2bfb881a0467bf205dc54158cc5970f616 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Mon, 11 Nov 2019 11:37:48 +1100
Subject: [PATCH] Fix session handling issue
---
Signal/src/Loki/Onboarding/SeedVC.swift | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/Signal/src/Loki/Onboarding/SeedVC.swift b/Signal/src/Loki/Onboarding/SeedVC.swift
index 43c368dc0..657b23ae7 100644
--- a/Signal/src/Loki/Onboarding/SeedVC.swift
+++ b/Signal/src/Loki/Onboarding/SeedVC.swift
@@ -5,7 +5,6 @@ final class SeedVC : OnboardingBaseViewController, DeviceLinkingModalDelegate {
private var mode: Mode = .register { didSet { if mode != oldValue { handleModeChanged() } } }
private var seed: Data! { didSet { updateMnemonic() } }
private var mnemonic: String! { didSet { handleMnemonicChanged() } }
- private var linkingRequestMessageSendingTimer: Timer?
// MARK: Components
private lazy var registerStackView: UIStackView = {
@@ -347,21 +346,13 @@ final class SeedVC : OnboardingBaseViewController, DeviceLinkingModalDelegate {
present(deviceLinkingModal, animated: true, completion: nil)
let masterHexEncodedPublicKey = masterHexEncodedPublicKeyTextField.text!.trimmingCharacters(in: CharacterSet.whitespaces)
let linkingRequestMessage = DeviceLinkingUtilities.getLinkingRequestMessage(for: masterHexEncodedPublicKey)
- linkingRequestMessageSendingTimer = Timer.scheduledTimer(withTimeInterval: 4, repeats: true) { [weak self] _ in
- self?.sendLinkingRequestMessage(linkingRequestMessage)
- }
- sendLinkingRequestMessage(linkingRequestMessage)
+ ThreadUtil.enqueue(linkingRequestMessage)
} else {
onboardingController.pushDisplayNameVC(from: self)
}
}
-
- private func sendLinkingRequestMessage(_ linkingRequestMessage: DeviceLinkMessage) {
- ThreadUtil.enqueue(linkingRequestMessage)
- }
func handleDeviceLinkAuthorized(_ deviceLink: DeviceLink) {
- linkingRequestMessageSendingTimer?.invalidate()
let userDefaults = UserDefaults.standard
userDefaults.set(true, forKey: "didUpdateForMainnet")
userDefaults.set(deviceLink.master.hexEncodedPublicKey, forKey: "masterDeviceHexEncodedPublicKey")
@@ -370,7 +361,6 @@ final class SeedVC : OnboardingBaseViewController, DeviceLinkingModalDelegate {
}
func handleDeviceLinkingModalDismissed() {
- linkingRequestMessageSendingTimer?.invalidate()
let appDelegate = UIApplication.shared.delegate as! AppDelegate
appDelegate.stopLongPollerIfNeeded()
TSAccountManager.sharedInstance().resetForReregistration()