Update DeviceKit and tweak user agent string on mac. (#2496)

This commit is contained in:
Doug
2024-02-23 11:26:01 +00:00
committed by GitHub
parent a3b3aa8517
commit c573b7caa1
5 changed files with 21 additions and 11 deletions
+16 -7
View File
@@ -31,12 +31,21 @@ final class UserAgentBuilder {
let clientVersion = InfoPlistReader.app.bundleShortVersionString
#if os(iOS)
return String(format: "%@/%@ (%@; iOS %@; Scale/%0.2f)",
clientName,
clientVersion,
Device.current.safeDescription,
UIDevice.current.systemVersion,
UIScreen.main.scale)
let scale = UIScreen.main.scale
return if ProcessInfo.processInfo.isiOSAppOnMac {
String(format: "%@/%@ (Mac; macOS %@; Scale/%0.2f)",
clientName,
clientVersion,
ProcessInfo.processInfo.operatingSystemVersionString,
scale)
} else {
String(format: "%@/%@ (%@; iOS %@; Scale/%0.2f)",
clientName,
clientVersion,
Device.current.safeDescription,
UIDevice.current.systemVersion,
scale)
}
#elseif os(tvOS)
return String(format: "%@/%@ (%@; tvOS %@; Scale/%0.2f)",
clientName,
@@ -52,7 +61,7 @@ final class UserAgentBuilder {
WKInterfaceDevice.current.systemVersion,
WKInterfaceDevice.currentDevice.screenScale)
#elseif os(OSX)
return String(format: "%@/%@ (Mac; Mac OS X %@)",
return String(format: "%@/%@ (Mac; macOS %@)",
clientName,
clientVersion,
NSProcessInfo.processInfo.operatingSystemVersionString)