Skip to content

fix(ios): align user agent with analytics-swift #222

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
MichaelGHSeg merged 2 commits into from
Oct 16, 2026
Merged

fix(ios): align user agent with analytics-swift #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f21a78
fix(ios): align user agent with analytics-swift
zachdean Oct 12, 2026
a05455e
Merge branch 'main' into webkit-start
MichaelGHSeg Oct 16, 2026
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
43 changes: 14 additions & 29 deletions packages/core/ios/segment_analytics/Sources/segment_analytics/AppleUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ import Foundation

import SystemConfiguration
import UIKit
#if !os(tvOS)
import WebKit
#endif

internal class iOSVendorSystem: VendorSystem {
private let device = UIDevice.current
Expand Down Expand Up @@ -64,23 +61,21 @@ internal class iOSVendorSystem: VendorSystem {
}

override var userAgent: String? {
#if !os(tvOS)
var userAgent: 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
return iOSVendorSystem.generatedUserAgent
}

private static let generatedUserAgent: String = {
#if os(tvOS)
return "unknown"
#else
let v = ProcessInfo.processInfo.operatingSystemVersion
let version = v.patchVersion > 0
? "\(v.majorVersion)_\(v.minorVersion)_\(v.patchVersion)"
: "\(v.majorVersion)_\(v.minorVersion)"
let model = UIDevice.current.model.contains("iPhone") ? "iPhone" : "iPad"
return "Mozilla/5.0 (\(model); CPU \(model) OS \(version) like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148"
#endif
}
}()

override var connection: ConnectionStatus {
return connectionStatus()
Expand Down Expand Up @@ -186,7 +181,6 @@ internal class watchOSVendorSystem: VendorSystem {
#if os(macOS)

import Cocoa
import WebKit

internal class MacOSVendorSystem: VendorSystem {
private let device = ProcessInfo.processInfo
Expand Down Expand Up @@ -230,16 +224,7 @@ internal class MacOSVendorSystem: VendorSystem {
}

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

return userAgent
return "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)"
}

override var connection: ConnectionStatus {
Expand Down
43 changes: 14 additions & 29 deletions packages/core/macos/segment_analytics/Sources/segment_analytics/AppleUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ import Foundation

import SystemConfiguration
import UIKit
#if !os(tvOS)
import WebKit
#endif

internal class iOSVendorSystem: VendorSystem {
private let device = UIDevice.current
Expand Down Expand Up @@ -64,23 +61,21 @@ internal class iOSVendorSystem: VendorSystem {
}

override var userAgent: String? {
#if !os(tvOS)
var userAgent: 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
return iOSVendorSystem.generatedUserAgent
}

private static let generatedUserAgent: String = {
#if os(tvOS)
return "unknown"
#else
let v = ProcessInfo.processInfo.operatingSystemVersion
let version = v.patchVersion > 0
? "\(v.majorVersion)_\(v.minorVersion)_\(v.patchVersion)"
: "\(v.majorVersion)_\(v.minorVersion)"
let model = UIDevice.current.model.contains("iPhone") ? "iPhone" : "iPad"
return "Mozilla/5.0 (\(model); CPU \(model) OS \(version) like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148"
#endif
}
}()

override var connection: ConnectionStatus {
return connectionStatus()
Expand Down Expand Up @@ -186,7 +181,6 @@ internal class watchOSVendorSystem: VendorSystem {
#if os(macOS)

import Cocoa
import WebKit

internal class MacOSVendorSystem: VendorSystem {
private let device = ProcessInfo.processInfo
Expand Down Expand Up @@ -230,16 +224,7 @@ internal class MacOSVendorSystem: VendorSystem {
}

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

return userAgent
return "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko)"
}

override var connection: ConnectionStatus {
Expand Down
Loading