938 Fixed Device UA being empty on First Bid Request

PrebidMobile/PrebidMobileRendering/Utilities/PBMUserAgentService.m

@@ -86,7 +86,7 @@ - (void)setUserAgent {
 
 - (void)setUserAgentInThread:(id<PBMNSThreadProtocol>)thread {
     if (!thread.isMainThread) {
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_sync(dispatch_get_main_queue(), ^{
             [self setUserAgent];
         });
         return;
@@ -95,21 +95,9 @@ - (void)setUserAgentInThread:(id<PBMNSThreadProtocol>)thread {
 }
 
 - (void)generateUserAgent {
-    @weakify(self);
-    [self.webView evaluateJavaScript:@"navigator.userAgent" completionHandler:^(id result, NSError *error) {
-        @strongify(self);
-        if (!self) { return; }
-
-        if (error) {
-            PBMLogError(@"%@", error);
-        }
-        else if (result) {
-            NSString *resultString = [NSString stringWithFormat:@"%@", result];
-            self.userAgent = (resultString) ? resultString : @"";
-        }
-
-        self.webView = nil;
-    }];
+    self.userAgent = [self.webView valueForKey:@"userAgent"];
+    self.userAgent = (self.userAgent) ? self.userAgent : @"";
+    self.webView = nil;
 }
 
 @end

PrebidMobileTests/RenderingTests/Tests/UtilitiesExtensionsTests/PBMUserAgentServiceTest.swift

@@ -26,25 +26,21 @@ class PBMUserAgentServiceTest: XCTestCase {
         expectationUserAgentExecuted = expectation(description: "expectationUserAgentExecuted")
 
         let userAgentService = PBMUserAgentService.shared
+        let userAgentString = userAgentService.getFullUserAgent()
 
-        // Waiting for JS userAgent execute asynchronously
-        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-            let userAgentString = userAgentService.getFullUserAgent()
-
-            //Should start with a useragent from the Web View
-            XCTAssert(userAgentString.PBMdoesMatch("^Mozilla"))
-
-            if UIDevice.current.userInterfaceIdiom == .pad {
-                XCTAssert(userAgentString.PBMdoesMatch("iPad"))
-            } else if UIDevice.current.userInterfaceIdiom == .phone {
-                XCTAssert(userAgentString.PBMdoesMatch("iPhone"))
-            }
-
-            XCTAssert(userAgentString.PBMdoesMatch("AppleWebKit"))
-
-            self.expectationUserAgentExecuted?.fulfill()
+        //Should start with a useragent from the Web View
+        XCTAssert(userAgentString.PBMdoesMatch("^Mozilla"))
+
+        if UIDevice.current.userInterfaceIdiom == .pad {
+            XCTAssert(userAgentString.PBMdoesMatch("iPad"))
+        } else if UIDevice.current.userInterfaceIdiom == .phone {
+            XCTAssert(userAgentString.PBMdoesMatch("iPhone"))
         }
 
+        XCTAssert(userAgentString.PBMdoesMatch("AppleWebKit"))
+
+        self.expectationUserAgentExecuted?.fulfill()
+
         waitForExpectations(timeout: 5)
     }