Addressed PR feedback. Calls delegate method on main queue.

mapbox · Jul 15, 2019 · 228e402 · 228e402
1 parent 4250e08
commit 228e402
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/platform/darwin/src/MGLNetworkConfiguration.m b/platform/darwin/src/MGLNetworkConfiguration.m
@@ -67,8 +67,8 @@ - (NSURLSessionConfiguration *)defaultSessionConfiguration {
 }
 
 - (void)startDownloadEvent:(NSString *)urlString type:(NSString *)resourceType {
-    NSDate *startDate = [NSDate date];
     if (urlString && ![self eventDictionaryForKey:urlString]) {
+        NSDate *startDate = [NSDate date];
         [self setEventDictionary:@{ MGLStartTime: startDate, MGLResourceType: resourceType } forKey:urlString];
     }
 }
@@ -87,8 +87,11 @@ - (void)sendEventForURLResponse:(NSURLResponse *)response withAction:(NSString *
         NSString *urlString = response.URL.relativePath;
         if (urlString && [self eventDictionaryForKey:urlString]) {
             NSDictionary *eventAttributes = [self eventAttributesForURL:response withAction:action];
-            [self.metricsDelegate networkConfiguration:self didGenerateMetricEvent:eventAttributes];
             [self removeEventDictionaryForKey:urlString];
+
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self.metricsDelegate networkConfiguration:self didGenerateMetricEvent:eventAttributes];
+            });            
         }
     }
 

diff --git a/platform/ios/test/MGLNetworkConfigurationTests.m b/platform/ios/test/MGLNetworkConfigurationTests.m
@@ -7,6 +7,7 @@ @interface MGLNetworkConfigurationTests : XCTestCase
 
 @implementation MGLNetworkConfigurationTests
 
+// Regression test for https://github.com/mapbox/mapbox-gl-native/issues/14982
 - (void)testAccessingEventsFromMultipleThreads {
     MGLNetworkConfiguration *configuration = [[MGLNetworkConfiguration alloc] init];