Skip to content

Commit f3b5001

Browse files
authored
Add simulator to user agent string in case if it's present. (#3963)
* Add `UIDevice` extension. Add simulator to user agent string in case if it's present.
1 parent d57bbd7 commit f3b5001

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

MapboxNavigation.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@
240240
8AC3965325DC66570027A035 /* NavigationCameraType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC3965225DC66570027A035 /* NavigationCameraType.swift */; };
241241
8AC4091E279918470075248E /* NavigationViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC4091D279918470075248E /* NavigationViewLayout.swift */; };
242242
8AC40920279918930075248E /* NavigationViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC4091F279918930075248E /* NavigationViewDelegate.swift */; };
243+
8AC85EA428628E4F003F8FC8 /* UIDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC85EA328628E4F003F8FC8 /* UIDevice.swift */; };
243244
8ACF0AAA2706394A00F30423 /* CPInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ACF0AA92706394A00F30423 /* CPInterfaceController.swift */; };
244245
8AD12F4C26C193560008AE55 /* LeaksTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD12F4826C193520008AE55 /* LeaksTests.swift */; };
245246
8AD12F4D26C1A5C10008AE55 /* Snapshot++.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD12F4326C191080008AE55 /* Snapshot++.swift */; };
@@ -812,6 +813,7 @@
812813
8AC3965225DC66570027A035 /* NavigationCameraType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationCameraType.swift; sourceTree = "<group>"; };
813814
8AC4091D279918470075248E /* NavigationViewLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationViewLayout.swift; sourceTree = "<group>"; };
814815
8AC4091F279918930075248E /* NavigationViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationViewDelegate.swift; sourceTree = "<group>"; };
816+
8AC85EA328628E4F003F8FC8 /* UIDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIDevice.swift; sourceTree = "<group>"; };
815817
8ACF0AA92706394A00F30423 /* CPInterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPInterfaceController.swift; sourceTree = "<group>"; };
816818
8AD12F4326C191080008AE55 /* Snapshot++.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Snapshot++.swift"; sourceTree = "<group>"; };
817819
8AD12F4826C193520008AE55 /* LeaksTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LeaksTests.swift; sourceTree = "<group>"; };
@@ -1933,6 +1935,7 @@
19331935
351927351F0FA072003A702D /* ScreenCapture.swift */,
19341936
3A8187C824BDAE9C00708F19 /* URLSession.swift */,
19351937
11D1F89F2696048D0053A93F /* Dictionary+DeepMerge.swift */,
1938+
8AC85EA328628E4F003F8FC8 /* UIDevice.swift */,
19361939
);
19371940
name = Extensions;
19381941
sourceTree = "<group>";
@@ -2948,6 +2951,7 @@
29482951
2E50E0D2264E468B009D3848 /* RoadObjectMatcherError.swift in Sources */,
29492952
2BF36181283F7B4800C51848 /* AlternativeRoutesCenter.swift in Sources */,
29502953
8D2AA745211CDD4000EB7F72 /* NavigationService.swift in Sources */,
2954+
8AC85EA428628E4F003F8FC8 /* UIDevice.swift in Sources */,
29512955
2BEA240A27D205B500EE05D9 /* RerouteController.swift in Sources */,
29522956
2B01E4B8274671550002A5F7 /* Directions+RoutingProvider.swift in Sources */,
29532957
2B7ACA9C25E3F84700B0ACFD /* PredictiveCacheOptions.swift in Sources */,
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import UIKit
2+
3+
extension UIDevice {
4+
5+
static var isSimulator: Bool {
6+
#if targetEnvironment(simulator)
7+
return true
8+
#else
9+
return false
10+
#endif
11+
}
12+
}

Sources/MapboxCoreNavigation/URLSession.swift

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Foundation
22
import MapboxDirections
3+
import UIKit
34

45
extension URLSession {
56
/**
@@ -92,12 +93,22 @@ extension URLSession {
9293
#elseif arch(i386)
9394
chip = "i386"
9495
#endif
95-
let chipComponent = "(\(chip))"
9696

97-
let components: [String] = bundleComponents + [
97+
var simulator: String? = nil
98+
if UIDevice.isSimulator {
99+
simulator = "Simulator"
100+
}
101+
102+
let otherComponents = [
103+
chip,
104+
simulator
105+
].compactMap({ $0 })
106+
107+
let components = bundleComponents + [
98108
systemComponent,
99-
chipComponent,
109+
"(\(otherComponents.joined(separator: "; ")))"
100110
]
111+
101112
return components.joined(separator: " ")
102113
}()
103114
}

0 commit comments

Comments
 (0)