Skip to content

Fixed crashing unit tests from userAgent update #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2021
Merged

Fixed crashing unit tests from userAgent update #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions Sources/Segment/Plugins/Platforms/Vendors/AppleUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,15 @@ internal class iOSVendorSystem: VendorSystem {
override var userAgent: String? {
#if !os(tvOS)
var userAgent: String?
DispatchQueue.main.sync {
userAgent = WKWebView().value(forKey: "userAgent") as? String

if Thread.isMainThread {
userAgent = WKWebView().value(forKey: "userAgent") as? String
} else {
DispatchQueue.main.sync {
userAgent = WKWebView().value(forKey: "userAgent") as? String
}
}

return userAgent
#else
// webkit isn't on tvos
Expand Down Expand Up @@ -233,9 +239,14 @@ internal class MacOSVendorSystem: VendorSystem {

override var userAgent: String? {
var userAgent: String?
DispatchQueue.main.sync {
userAgent = WKWebView().value(forKey: "userAgent") as? String
if Thread.isMainThread {
userAgent = WKWebView().value(forKey: "userAgent") as? String
} else {
DispatchQueue.main.sync {
userAgent = WKWebView().value(forKey: "userAgent") as? String
}
}

return userAgent
}

Expand Down