Regression fix: Allow accessing current location while debugging (#179)

Also, related localization tweak
skedgo · May 31, 2022 · 5001030 · 5001030
1 parent 7661c7c
commit 5001030
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/Sources/TripKit/core/Loc.swift b/Sources/TripKit/core/Loc.swift
@@ -226,6 +226,10 @@ public class Loc : NSObject {
     return NSLocalizedString("Search Results", tableName: "Shared", bundle: .tripKit, comment: "")
   }
 
+  public static var LocalizationPermissionsMissing: String {
+    return NSLocalizedString("Location services are required to use this feature. Please go to the Settings app > Privacy > Location Services, make sure they are turned on and authorise this app.", tableName: "Shared", bundle: .tripKit, comment: "Location iOS authorisation needed text")
+  }
+
 
   // MARK: - Format
 

diff --git a/Sources/TripKit/managers/TKLocationManager.swift b/Sources/TripKit/managers/TKLocationManager.swift
@@ -26,16 +26,32 @@ public extension TKLocationManager {
 
 }
 
+extension TKLocationManager.LocalizationError: LocalizedError {
+  public var errorDescription: String? {
+    switch self {
+    case .authorizationDenied:
+      return Loc.LocalizationPermissionsMissing
+    case .featureNotAvailable:
+      return nil
+    }
+  }
+}
+
 
 // TKPermissionManager overrides
 
 extension TKLocationManager {
 
   open override func featureIsAvailable() -> Bool {
+    if Bundle.main.infoDictionary?.keys.contains("NSLocationWhenInUseUsageDescription") == true {
+      return true
+    }
+
     #if DEBUG
+    // Assume available, when running tests
     return ProcessInfo().environment.keys.contains("XCTestSessionIdentifier")
     #else
-    return Bundle.main.infoDictionary?.keys.contains("NSLocationWhenInUseUsageDescription") == true
+    return false
     #endif
   }
 
@@ -71,8 +87,7 @@ extension TKLocationManager {
   }
 
   open override func authorizationAlertText() -> String {
-    return NSLocalizedString("Location services are required to use this feature. Please go to the Settings app > Privacy > Location Services, make sure they are turned on and authorise this app.", tableName: "Shared", bundle: .tripKit, comment: "Location iOS authorisation needed text")
+    return Loc.LocalizationPermissionsMissing
   }
 
-
 }