From 0ac2aaf8bb5c3c1bc84cf40c842b44ef38410bb8 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Mon, 23 Sep 2019 10:03:38 +1000
Subject: [PATCH] Don't time out

---
 Signal/src/Loki/DeviceLinkingModal.swift        |  4 ----
 .../Multi Device/LokiDeviceLinkingSession.swift | 17 +----------------
 .../LokiDeviceLinkingSessionDelegate.swift      |  1 -
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/Signal/src/Loki/DeviceLinkingModal.swift b/Signal/src/Loki/DeviceLinkingModal.swift
index 90a1b6a2e..ecf084b33 100644
--- a/Signal/src/Loki/DeviceLinkingModal.swift
+++ b/Signal/src/Loki/DeviceLinkingModal.swift
@@ -94,10 +94,6 @@ final class DeviceLinkingModal : UIViewController, LokiDeviceLinkingSessionDeleg
     
     // MARK: Device Linking
     func requestUserAuthorization(for deviceLink: LokiDeviceLink) {
-    
-    }
-    
-    func handleDeviceLinkingSessionTimeout() {
         
     }
     
diff --git a/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSession.swift b/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSession.swift
index 33d44b903..98be7bc83 100644
--- a/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSession.swift	
+++ b/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSession.swift	
@@ -3,30 +3,21 @@ import PromiseKit
 @objc (LKDeviceLinkingSession)
 public final class LokiDeviceLinkingSession : NSObject {
     private let delegate: LokiDeviceLinkingSessionDelegate
-    private var timer: Timer?
     @objc public var isListeningForLinkingRequests = false
     
     // MARK: Lifecycle
     @objc public init(delegate: LokiDeviceLinkingSessionDelegate) {
         self.delegate = delegate
     }
-    
-    // MARK: Settings
-    private let listeningTimeout: TimeInterval = 60
 
     // MARK: Public API
     @objc public func startListeningForLinkingRequests() {
         isListeningForLinkingRequests = true
-        timer = Timer.scheduledTimer(withTimeInterval: listeningTimeout, repeats: false) { [weak self] timer in
-            guard let self = self else { return }
-            self.stopListeningForLinkingRequests()
-            self.delegate.handleDeviceLinkingSessionTimeout()
-        }
     }
     
     @objc public func processLinkingRequest(from slaveHexEncodedPublicKey: String, with slaveSignature: Data) {
         guard isListeningForLinkingRequests else { return }
-        stopListeningForLinkingRequests()
+        isListeningForLinkingRequests = false
         let master = LokiDeviceLink.Device(hexEncodedPublicKey: OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey)
         let slave = LokiDeviceLink.Device(hexEncodedPublicKey: slaveHexEncodedPublicKey, signature: slaveSignature)
         let deviceLink = LokiDeviceLink(between: master, and: slave)
@@ -38,12 +29,6 @@ public final class LokiDeviceLinkingSession : NSObject {
         // TODO: Send a device link authorized message
     }
     
-    @objc public func stopListeningForLinkingRequests() {
-        timer?.invalidate()
-        timer = nil
-        isListeningForLinkingRequests = false
-    }
-    
     // MARK: Private API
     private func isValid(_ deviceLink: LokiDeviceLink) -> Bool {
         return true // TODO: Implement
diff --git a/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSessionDelegate.swift b/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSessionDelegate.swift
index 2c406b61e..1918a379e 100644
--- a/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSessionDelegate.swift	
+++ b/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSessionDelegate.swift	
@@ -3,5 +3,4 @@
 public protocol LokiDeviceLinkingSessionDelegate {
     
     @objc func requestUserAuthorization(for deviceLink: LokiDeviceLink)
-    @objc func handleDeviceLinkingSessionTimeout()
 }