Merge pull request #467 from WalletConnect/background-task-fix

[Hotfix] Fix background task not invalidated
WalletConnect · Aug 24, 2022 · 3ce0e60 · 3ce0e60
2 parents 8cddac9 + 344041c
commit 3ce0e60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift b/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift
@@ -36,7 +36,6 @@ class AutomaticSocketConnectionHandler: SocketConnectionHandler {
         }
 
         appStateObserver.onWillEnterForeground = { [unowned self] in
-            backgroundTaskRegistrar.invalidate()
             socket.connect()
         }
     }

diff --git a/Sources/WalletConnectRelay/SocketConnectionHandler/BackgroundTaskRegistering.swift b/Sources/WalletConnectRelay/SocketConnectionHandler/BackgroundTaskRegistering.swift
@@ -5,7 +5,6 @@ import UIKit
 
 protocol BackgroundTaskRegistering {
     func register(name: String, completion: @escaping () -> Void)
-    func invalidate()
 }
 
 class BackgroundTaskRegistrar: BackgroundTaskRegistering {
@@ -15,7 +14,7 @@ class BackgroundTaskRegistrar: BackgroundTaskRegistering {
 
     func register(name: String, completion: @escaping () -> Void) {
 #if os(iOS)
-        backgroundTaskID = .invalid
+        invalidateIfNeeded()
         backgroundTaskID = UIApplication.shared.beginBackgroundTask(withName: name) { [unowned self] in
             UIApplication.shared.endBackgroundTask(backgroundTaskID)
             backgroundTaskID = .invalid
@@ -24,7 +23,7 @@ class BackgroundTaskRegistrar: BackgroundTaskRegistering {
 #endif
     }
 
-    func invalidate() {
+    private func invalidateIfNeeded() {
 #if os(iOS)
         if backgroundTaskID != .invalid {
             UIApplication.shared.endBackgroundTask(backgroundTaskID)
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             appStateObserver.onWillEnterForeground = { [unowned self] in
-                backgroundTaskRegistrar.invalidate()
                 socket.connect()
             }
         }
@@ Expand Down @@