read App Windows in the main thread for view hierarchy fetch

getsentry · Jan 19, 2023 · 917d84e · 917d84e
1 parent b2f82fa
commit 917d84e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/Sources/Sentry/SentryViewHierarchy.m b/Sources/Sentry/SentryViewHierarchy.m
@@ -48,11 +48,11 @@ - (BOOL)saveViewHierarchy:(NSString *)filePath
 
 - (NSData *)fetchViewHierarchy
 {
-    NSArray<UIWindow *> *windows = [SentryDependencyContainer.sharedInstance.application windows];
-
     __block NSMutableData *result = [[NSMutableData alloc] init];
 
     void (^save)(void) = ^{
+        NSArray<UIWindow *> *windows = [SentryDependencyContainer.sharedInstance.application windows];
+
         if (![self processViewHierarchy:windows
                             addFunction:writeJSONDataToMemory
                                userData:(__bridge void *)(result)]) {

diff --git a/Tests/SentryTests/SentryViewHierarchyTests.swift b/Tests/SentryTests/SentryViewHierarchyTests.swift
@@ -172,14 +172,37 @@ class SentryViewHierarchyTests: XCTestCase {
         wait(for: [ex], timeout: 1)
     }
 
+    func test_fetch_usesMainThread() {
+        let sut = TestSentryViewHierarchy()
+        let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 10, height: 10))
+        fixture.uiApplication.windows = [window]
+
+        let ex = expectation(description: "Running on background Thread")
+        let dispatch = DispatchQueue(label: "background")
+        dispatch.async {
+            let _ = sut.fetch()
+            ex.fulfill()
+        }
+
+        wait(for: [ex], timeout: 1)
+        XCTAssertTrue(fixture.uiApplication.calledOnMainThread, "fetchViewHierarchy is not using the main thread to get UI windows")
+    }
+
     class TestSentryUIApplication: SentryUIApplication {
         private var _windows: [UIWindow]?
+        private var _calledOnMainThread = true
+
+        var calledOnMainThread : Bool {
+            return _calledOnMainThread
+        }
 
         override var windows: [UIWindow]? {
             get {
+                _calledOnMainThread = Thread.isMainThread
                 return _windows
             }
             set {
+                _calledOnMainThread = Thread.isMainThread
                 _windows = newValue
             }
         }