Don't time out

Signal/src/Loki/DeviceLinkingModal.swift

@@ -97,10 +97,6 @@ final class DeviceLinkingModal : UIViewController, LokiDeviceLinkingSessionDeleg
         
     }
     
-    func handleDeviceLinkingSessionTimeout() {
-        
-    }
-    
     // MARK: Interaction
     override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         let touch = touches.first!

SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSession.swift

@@ -3,7 +3,6 @@ import PromiseKit
 @objc (LKDeviceLinkingSession)
 public final class LokiDeviceLinkingSession : NSObject {
     private let delegate: LokiDeviceLinkingSessionDelegate
-    private var timer: Timer?
     @objc public var isListeningForLinkingRequests = false
     
     // MARK: Lifecycle
@@ -11,22 +10,14 @@ public final class LokiDeviceLinkingSession : NSObject {
         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

SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSessionDelegate.swift

@@ -3,5 +3,4 @@
 public protocol LokiDeviceLinkingSessionDelegate {
     
     @objc func requestUserAuthorization(for deviceLink: LokiDeviceLink)
-    @objc func handleDeviceLinkingSessionTimeout()
 }