Somewhat sane app permissions onboarding flow

Author: garthvh

Localizable.xcstrings

@@ -6631,6 +6631,9 @@
           }
         }
       }
+    },
+    "Continue to next step" : {
+
     },
     "Control Type" : {
       "localizations" : {
@@ -9464,9 +9467,6 @@
           }
         }
       }
-    },
-    "Enable location services" : {
-
     },
     "Enable MQTT" : {
 
@@ -19219,6 +19219,9 @@
           }
         }
       }
+    },
+    "Meshtastic uses your phone's location to enable a number of features. You can update your location permissions at any time from Settings > App Setting > Open Settings." : {
+
     },
     "Meshtastic® Copyright Meshtastic LLC" : {
       "localizations" : {
@@ -21950,6 +21953,9 @@
           }
         }
       }
+    },
+    "Phone Location Permissions" : {
+
     },
     "phone.gps" : {
       "localizations" : {

Meshtastic/Helpers/BLEManager.swift

@@ -200,9 +200,6 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 		if UserDefaults.preferredPeripheralId.count < 1 {
 			UserDefaults.preferredPeripheralId = peripheral.identifier.uuidString
 		}
-		if UserDefaults.firstLaunch {
-			UserDefaults.showOnboarding = true
-		}
 		// Invalidate and reset connection timer count
 		timeoutTimerCount = 0
 		if timeoutTimer != nil {
@@ -221,6 +218,9 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 			disconnectPeripheral()
 			return
 		}
+		if UserDefaults.firstLaunch {
+			UserDefaults.showOnboarding = true
+		}
 		// Discover Services
 		peripheral.discoverServices([meshtasticServiceCBUUID])
 		Logger.services.info("✅ [BLE] Connected: \(peripheral.name ?? "Unknown", privacy: .public)")

Meshtastic/Helpers/LocationHelper.swift

@@ -9,11 +9,20 @@ class LocationHelper: NSObject, ObservableObject, CLLocationManagerDelegate {
 
 	// @Published var region = MKCoordinateRegion()
 	@Published var authorizationStatus: CLAuthorizationStatus?
+
+	// The continuation we will use to asynchronously ask the user permission to track their location.
+	private var permissionContinuation: CheckedContinuation<CLAuthorizationStatus, Never>?
+
+	func requestLocationAlwaysPermissions() async -> CLAuthorizationStatus {
+		self.locationManager.requestAlwaysAuthorization()
+		return await withCheckedContinuation { continuation in
+		   permissionContinuation = continuation
+		}
+   }
 	override init() {
 		super.init()
 		locationManager.delegate = self
 		locationManager.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
-		locationManager.pausesLocationUpdatesAutomatically = true
 		locationManager.allowsBackgroundLocationUpdates = true
 		locationManager.activityType = .other
 	}
@@ -55,14 +64,12 @@ class LocationHelper: NSObject, ObservableObject, CLLocationManagerDelegate {
 			authorizationStatus = .authorizedAlways
 		case .authorizedWhenInUse:
 			authorizationStatus = .authorizedWhenInUse
-			locationManager.requestLocation()
 		case .restricted:
 			authorizationStatus = .restricted
 		case .denied:
 			authorizationStatus = .denied
 		case .notDetermined:
 			authorizationStatus = .notDetermined
-			locationManager.requestAlwaysAuthorization()
 		default:
 			break
 		}

Meshtastic/Views/Onboarding/OnboardingView.swift

@@ -135,29 +135,54 @@ struct OnboardingView: View {
 
 	var locationView: some View {
 		VStack {
-			Text("Enable location services")
-			Spacer()
-			Button {
-				Task {
-					await goToNextStep(after: .location)
-				}
-			} label: {
-				Text("Enable location services")
-					.frame(maxWidth: .infinity)
+			VStack {
+				Text("Phone Location Permissions")
+					.font(.largeTitle.bold())
+					.multilineTextAlignment(.center)
+					.fixedSize(horizontal: false, vertical: true)
+			}
+			VStack(alignment: .leading, spacing: 16) {
+				Text("Meshtastic uses your phone's location to enable a number of features. You can update your location permissions at any time from Settings > App Setting > Open Settings.")
+					.font(.body.bold())
+					.multilineTextAlignment(.center)
+					.fixedSize(horizontal: false, vertical: true)
+				makeRow(
+					icon: "location",
+					title: "Share Location",
+					subtitle: "Use your phone GPS to send locations to your node to instead of using a hardware GPS on your node."
+				)
+				makeRow(
+					icon: "lines.measurement.horizontal",
+					title: "Distance Measurements",
+					subtitle: "Used to display the distance between your phone and other Meshtastic nodes where positions are available."
+				)
+				makeRow(
+					icon: "line.3.horizontal.decrease.circle",
+					title: "Distance Filters",
+					subtitle: "Filter the node list and mesh map based on proximity to your phone."
+				)
+				makeRow(
+					icon: "mappin",
+					title: "Mesh Map Location",
+					subtitle: "Enables the blue location dot for your phone in the mesh map."
+				)
 			}
 			.padding()
-			.buttonBorderShape(.capsule)
-			.controlSize(.large)
-			.padding()
-			.buttonStyle(.borderedProminent)
-
-			Button {
-				Task {
-					await goToNextStep(after: .mqtt)
+			Spacer()
+			if LocationHelper.shared.locationManager.authorizationStatus != .notDetermined {
+				Button {
+					Task {
+						await goToNextStep(after: .location)
+					}
+				} label: {
+					Text("Continue to next step")
+						.frame(maxWidth: .infinity)
 				}
-			} label: {
-				Text("Set up later")
-					.frame(maxWidth: .infinity)
+				.padding()
+				.buttonBorderShape(.capsule)
+				.controlSize(.large)
+				.padding()
+				.buttonStyle(.borderedProminent)
 			}
 		}
 	}
@@ -237,25 +262,23 @@ struct OnboardingView: View {
 		switch step {
 		case .none:
 			let status = await UNUserNotificationCenter.current().notificationSettings().authorizationStatus
-			if  status == .notDetermined {
+			let criticalAlert = await UNUserNotificationCenter.current().notificationSettings().criticalAlertSetting
+			if  status == .notDetermined && criticalAlert == .notSupported {
 				navigationPath.append(.notifications)
 			} else {
 				fallthrough
 			}
 		case .notifications:
-			let status = await UNUserNotificationCenter.current().notificationSettings().authorizationStatus
-			let criticalAlert = await UNUserNotificationCenter.current().notificationSettings().criticalAlertSetting
-			if  status == .notDetermined && criticalAlert == .notSupported {
-				await requestNotificationsPermissions()
+			let status = LocationHelper.shared.locationManager.authorizationStatus
+			if status == .notDetermined {
+				navigationPath.append(.location)
+				await LocationHelper.shared.requestLocationAlwaysPermissions()
 			} else {
 				fallthrough
 			}
 		case .location:
-			let status = LocationHelper.shared
-				.locationManager
-				.authorizationStatus
-			if status == .notDetermined {
-				navigationPath.append(.location)
+			if true {
+				navigationPath.append(.mqtt)
 			} else {
 				fallthrough
 			}
@@ -266,7 +289,7 @@ struct OnboardingView: View {
 
 	// MARK: Permission Checks
 
-	func requestNotificationsPermissions() async -> UNAuthorizationStatus {
+	func requestNotificationsPermissions() async {
 		let center = UNUserNotificationCenter.current()
 		do {
 			let success = try await center.requestAuthorization(options: [.alert, .badge, .sound, .criticalAlert])
@@ -275,10 +298,8 @@ struct OnboardingView: View {
 			} else {
 				Logger.services.info("Notification permissions denied")
 			}
-			return await center.notificationSettings().authorizationStatus
 		} catch {
 			Logger.services.error("Notification permissions error: \(error.localizedDescription)")
-			return .notDetermined
 		}
 	}
 }