Skip to content

Commit a48d74e

Browse files
chizhavkochizhavko
authored
Merge pull request #4690 from mapbox/chizhavko/fix-car-play
Fix for carplay
2 parents de65a3f + ec6e1e9 commit a48d74e

File tree

5 files changed

+59
-68
lines changed

5 files changed

+59
-68
lines changed

‎.circleci/config.yml

+25-61
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ version: 2.1
22

33
orbs:
44
slack: circleci/[email protected]
5+
macos: circleci/[email protected]
6+
gh: circleci/[email protected]
57

68
parameters:
79
weekly_snapshot:
@@ -35,19 +37,13 @@ commands:
3537
channel: mobile-bots
3638
event: pass
3739
template: basic_success_1
38-
branch_pattern: main
40+
branch_pattern: lts/v2
3941
- slack/notify:
4042
channel: mobile-bots
4143
event: fail
4244
template: basic_fail_1
43-
branch_pattern: main
45+
branch_pattern: lts/v2
4446
mentions: '@here'
45-
install-gh-cli:
46-
steps:
47-
- run:
48-
name: Install GitHub CLI
49-
command: |
50-
brew install gh
5147
install-xcodegen:
5248
steps:
5349
- run:
@@ -305,7 +301,7 @@ jobs:
305301
default: false
306302
macos:
307303
xcode: << parameters.xcode >>
308-
resource_class: macos.x86.medium.gen2
304+
resource_class: macos.m1.medium.gen1
309305
environment:
310306
HOMEBREW_NO_AUTO_UPDATE: 1
311307
steps:
@@ -316,6 +312,7 @@ jobs:
316312
- *install-gems
317313
- *prepare-mapbox-file
318314
- *prepare-netrc-file
315+
- macos/install-rosetta
319316
- *update-carthage-version
320317
- when:
321318
condition: << parameters.update >>
@@ -374,13 +371,14 @@ jobs:
374371
default: "MapboxCoreNavigation"
375372
macos:
376373
xcode: << parameters.xcode >>
377-
resource_class: macos.x86.medium.gen2
374+
resource_class: macos.m1.medium.gen1
378375
environment:
379376
HOMEBREW_NO_AUTO_UPDATE: 1
380377
steps:
381378
- checkout
382379
- *prepare-mapbox-file
383380
- *prepare-netrc-file
381+
- macos/install-rosetta
384382
- run:
385383
name: Install prerequisites
386384
command: if [ $(xcversion simulators | grep -cF "iOS << parameters.iOS >> Simulator (installed)") -eq 0 ]; then xcversion simulators --install="iOS << parameters.iOS >>" || true; fi
@@ -450,7 +448,7 @@ jobs:
450448
default: true
451449
macos:
452450
xcode: << parameters.xcode >>
453-
resource_class: macos.x86.medium.gen2
451+
resource_class: macos.m1.medium.gen1
454452
environment:
455453
HOMEBREW_NO_AUTO_UPDATE: 1
456454
steps:
@@ -470,7 +468,7 @@ jobs:
470468
default: "14.1.0"
471469
macos:
472470
xcode: << parameters.xcode >>
473-
resource_class: macos.x86.medium.gen2
471+
resource_class: macos.m1.medium.gen1
474472
environment:
475473
HOMEBREW_NO_AUTO_UPDATE: 1
476474
steps:
@@ -492,7 +490,7 @@ jobs:
492490
default: false
493491
macos:
494492
xcode: << parameters.xcode >>
495-
resource_class: macos.x86.medium.gen2
493+
resource_class: macos.m1.medium.gen1
496494
environment:
497495
HOMEBREW_NO_AUTO_UPDATE: 1
498496
steps:
@@ -527,13 +525,14 @@ jobs:
527525
default: true
528526
macos:
529527
xcode: << parameters.xcode >>
530-
resource_class: macos.x86.medium.gen2
528+
resource_class: macos.m1.medium.gen1
531529
environment:
532530
HOMEBREW_NO_AUTO_UPDATE: 1
533531
steps:
534532
- checkout
535533
- *prepare-mapbox-file
536534
- *prepare-netrc-file
535+
- macos/install-rosetta
537536
- *add-github-to-known-hosts
538537
- run:
539538
name: Build test host application and execute tests
@@ -572,7 +571,7 @@ jobs:
572571
xcode: << parameters.xcode >>
573572
environment:
574573
HOMEBREW_NO_AUTO_UPDATE: 1
575-
resource_class: macos.x86.medium.gen2
574+
resource_class: macos.m1.medium.gen1
576575
steps:
577576
- checkout
578577
- when:
@@ -599,6 +598,7 @@ jobs:
599598
- *add-github-to-known-hosts
600599
- *prepare-mapbox-file
601600
- *prepare-netrc-file
601+
- macos/install-rosetta
602602
- *update-carthage-version
603603
- when:
604604
condition: << parameters.is_base_api >>
@@ -630,14 +630,13 @@ jobs:
630630
xcode: 14.2.0
631631
environment:
632632
HOMEBREW_NO_AUTO_UPDATE: 1
633-
resource_class: macos.x86.medium.gen2
633+
resource_class: macos.m1.medium.gen1
634634
steps:
635635
- checkout
636636
- *add-github-to-known-hosts
637637
- *prepare-mapbox-file
638638
- *prepare-netrc-file
639639
- install-mbx-ci
640-
- install-gh-cli
641640
- restore-api-diff-cache:
642641
key: .Environment.CIRCLE_SHA1
643642
is_template: true
@@ -662,7 +661,7 @@ jobs:
662661
spm-core-integration-test-job:
663662
macos:
664663
xcode: "14.3.1"
665-
resource_class: macos.x86.medium.gen2
664+
resource_class: macos.m1.medium.gen1
666665
steps:
667666
- checkout
668667
- *prepare-netrc-file
@@ -674,7 +673,7 @@ jobs:
674673
spm-ui-integration-test-job:
675674
macos:
676675
xcode: "14.1.0"
677-
resource_class: macos.x86.medium.gen2
676+
resource_class: macos.m1.medium.gen1
678677
steps:
679678
- checkout
680679
- install-bash5
@@ -695,7 +694,7 @@ jobs:
695694
xcode: << parameters.xcode >>
696695
environment:
697696
HOMEBREW_NO_AUTO_UPDATE: 1
698-
resource_class: macos.x86.medium.gen2
697+
resource_class: macos.m1.medium.gen1
699698
steps:
700699
- checkout
701700
- *restore-cache-gems
@@ -743,7 +742,7 @@ jobs:
743742
xcode: << parameters.xcode >>
744743
environment:
745744
HOMEBREW_NO_AUTO_UPDATE: 1
746-
resource_class: macos.x86.medium.gen2
745+
resource_class: macos.m1.medium.gen1
747746
steps:
748747
- checkout
749748
- *restore-cache-gems
@@ -772,7 +771,7 @@ jobs:
772771
xcode: << parameters.xcode >>
773772
environment:
774773
HOMEBREW_NO_AUTO_UPDATE: 1
775-
resource_class: macos.x86.medium.gen2
774+
resource_class: macos.m1.medium.gen1
776775
steps:
777776
- checkout
778777
- *restore-cache-gems
@@ -795,7 +794,7 @@ jobs:
795794
default: "14.1.0"
796795
macos:
797796
xcode: << parameters.xcode >>
798-
resource_class: macos.x86.medium.gen2
797+
resource_class: macos.m1.medium.gen1
799798
steps:
800799
- checkout
801800
- install-mbx-ci
@@ -808,7 +807,7 @@ jobs:
808807
default: "14.1.0"
809808
macos:
810809
xcode: << parameters.xcode >>
811-
resource_class: macos.x86.medium.gen2
810+
resource_class: macos.m1.medium.gen1
812811
steps:
813812
- checkout
814813
- install-mbx-ci
@@ -842,7 +841,7 @@ workflows:
842841
filters:
843842
branches:
844843
only:
845-
- main
844+
- lts/v2
846845
api-diff-workflow:
847846
jobs:
848847
- get-api-log-job:
@@ -857,15 +856,6 @@ workflows:
857856
requires:
858857
- "Get old API logs"
859858
- "Get new API logs"
860-
# FIXME: Temporarily disabled, failing tests that are executed with MapboxNavigationTestHost should be fixed.
861-
# test-host-workflow:
862-
# jobs:
863-
# - spm-test-host-job:
864-
# name: "swift test; Xcode 13.4.1; iOS 15.5"
865-
# xcode: "13.4.1"
866-
# iOS: "15.5"
867-
# device: "iPhone 13"
868-
# context: Slack Orb
869859
main-workflow:
870860
jobs:
871861
- build-job:
@@ -959,7 +949,7 @@ workflows:
959949
- ios-trigger-metrics:
960950
filters:
961951
branches:
962-
only: main
952+
only: lts/v2
963953
update-version-workflow:
964954
jobs:
965955
- update-version-job:
@@ -972,29 +962,3 @@ workflows:
972962
filters:
973963
branches:
974964
only: /^trigger-distribute-version-.*/
975-
# weekly-snapshot-workflow:
976-
# # Run workflow every Friday at 23:59 UTC
977-
# triggers:
978-
# - schedule:
979-
# cron: "59 23 * * 5"
980-
# filters:
981-
# branches:
982-
# only:
983-
# - main
984-
# jobs:
985-
# - release-weekly-snapshot
986-
weekly-snapshot-manual-workflow:
987-
when: << pipeline.parameters.weekly_snapshot >>
988-
jobs:
989-
- release-weekly-snapshot
990-
# pre-snapshot-workflow:
991-
# # Run workflow every Thursday at 23:59 UTC
992-
# triggers:
993-
# - schedule:
994-
# cron: "59 23 * * 4"
995-
# filters:
996-
# branches:
997-
# only:
998-
# - main
999-
# jobs:
1000-
# - pre-snapshot-check

‎CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
# Changes to the Mapbox Navigation SDK for iOS
22

3+
## v2.18.2
4+
5+
### CarPlay
6+
7+
* Fixed CarPlay crash when calling `CarPlayManager.routePreview()` function for iOS 14+.
8+
39
## v2.18.1
410

511
### CarPlay
612

7-
* Fixed CarPlay crash when calling `CarPlayManager.routePreview()` function.
13+
* Partially fixed CarPlay crash when calling `CarPlayManager.routePreview()` function.
814

915
## v2.18.0
1016

‎Example/ViewController.swift

+15-1
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,12 @@ class ViewController: UIViewController {
237237
guard let delegate = UIApplication.shared.delegate as? AppDelegate else { return }
238238
if let indexedRouteResponse = indexedRouteResponse {
239239
delegate.carPlayManager.previewRoutes(for: indexedRouteResponse)
240+
241+
// debug
242+
// By enabling following lines, it makes easy to reproduce the same crash.
243+
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
244+
delegate.carPlayManager.previewRoutes(for: indexedRouteResponse)
245+
}
240246
} else {
241247
delegate.carPlayManager.cancelRoutesPreview()
242248
}
@@ -251,7 +257,15 @@ class ViewController: UIViewController {
251257
}
252258

253259
@IBAction func simulateButtonPressed(_ sender: Any) {
254-
simulationButton.isSelected = !simulationButton.isSelected
260+
// simulationButton.isSelected = !simulationButton.isSelected
261+
262+
let destinationCoordinate = CLLocationCoordinate2D(latitude: 37.957453, longitude: -122.523200)
263+
let waypoint = Waypoint(coordinate: destinationCoordinate, name: "Dropped Pin #\(waypoints.endIndex + 1)")
264+
265+
waypoint.targetCoordinate = destinationCoordinate
266+
waypoints = [waypoint]
267+
268+
requestRoute()
255269
}
256270

257271
@IBAction func clearMapPressed(_ sender: Any) {

‎Sources/MapboxNavigation/CPInterfaceController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public extension CPInterfaceController {
1212
animated or not.
1313
*/
1414
func safePopTemplate(animated: Bool) {
15-
if templates.count == 1 { return }
16-
15+
guard templates.count > 1 else { return }
16+
1717
popTemplate(animated: animated)
1818
}
1919
}

‎Sources/MapboxNavigation/CarPlayManager.swift

+10-3
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public class CarPlayManager: NSObject {
102102
private weak var navigationService: NavigationService?
103103
private var idleTimerCancellable: IdleTimerManager.Cancellable?
104104
private var indexedRouteResponse: IndexedRouteResponse?
105-
105+
106106
/**
107107
Programatically begins a CarPlay turn-by-turn navigation session.
108108

@@ -653,6 +653,7 @@ extension CarPlayManager {
653653
}
654654

655655
func previewRoutes(for trip: CPTrip) {
656+
656657
guard let traitCollection = (self.carWindow?.rootViewController as? CarPlayMapViewController)?.traitCollection,
657658
let interfaceController = interfaceController else {
658659
return
@@ -673,8 +674,14 @@ extension CarPlayManager {
673674
previewMapTemplate.showTripPreviews([modifiedTrip], textConfiguration: previewText)
674675

675676
if currentActivity == .previewing {
676-
interfaceController.safePopTemplate(animated: false)
677-
interfaceController.pushTemplate(previewMapTemplate, animated: false)
677+
if #available(iOS 14.0, *) {
678+
interfaceController.popTemplate(animated: false) { _, _ in
679+
interfaceController.pushTemplate(previewMapTemplate, animated: false)
680+
}
681+
} else {
682+
interfaceController.safePopTemplate(animated: false)
683+
interfaceController.pushTemplate(previewMapTemplate, animated: false)
684+
}
678685
} else {
679686
interfaceController.pushTemplate(previewMapTemplate, animated: true)
680687
}

0 commit comments

Comments
 (0)