Fixed the case were we swizzle ourselves

embrace-io · Feb 12, 2025 · f56428d · f56428d
1 parent 2dc12da
commit f56428d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Sources/EmbraceCore/Capture/Network/URLSessionCaptureService.swift b/Sources/EmbraceCore/Capture/Network/URLSessionCaptureService.swift
@@ -119,6 +119,16 @@ struct URLSessionInitWithDelegateSwizzler: URLSessionSwizzler {
                     return originalImplementation(urlSession, Self.selector, configuration, delegate, queue)
                 }
 
+                guard !(proxiedDelegate is EMBURLSessionDelegateProxy) else {
+                    if let newDelegate = proxiedDelegate as? EMBURLSessionDelegateProxy,
+                       let originalDelegate = newDelegate.originalDelegate as? URLSessionDelegate {
+                        return originalImplementation(urlSession, Self.selector, configuration, originalDelegate, queue)
+                    } else {
+                        return originalImplementation(urlSession, Self.selector, configuration, delegate, queue)
+                    }
+                    return originalImplementation(urlSession, Self.selector, configuration, delegate, queue)
+                }
+
                 let newDelegate = EMBURLSessionDelegateProxy(delegate: proxiedDelegate, handler: handler)
                 let session = originalImplementation(urlSession, Self.selector, configuration, newDelegate, queue)
 

diff --git a/Sources/EmbraceObjCUtilsInternal/source/EMBURLSessionDelegateProxy.m b/Sources/EmbraceObjCUtilsInternal/source/EMBURLSessionDelegateProxy.m
@@ -92,7 +92,6 @@ - (void)URLSession:(NSURLSession *)session didBecomeInvalidWithError:(NSError *)
     if ([self.originalDelegate respondsToSelector:@selector(URLSession:didBecomeInvalidWithError:)]) {
         [self.originalDelegate URLSession:session didBecomeInvalidWithError:error];
     }
-    self.originalDelegate = nil;
 }
 
 #pragma mark - NSURLSessionTaskDelegate Methods