Add error handling when parsing SDK metadata (mapbox#2243)

hlongngo · Jul 31, 2024 · 2566f55 · 2566f55
1 parent ad68bf7
commit 2566f55
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Sources/MapboxMaps/Foundation/Events/EventsManager.swift b/Sources/MapboxMaps/Foundation/Events/EventsManager.swift
@@ -26,7 +26,6 @@ internal final class EventsManager: EventsManagerProtocol {
     private enum Constants {
         static let MGLAPIClientUserAgentBase = "mapbox-maps-ios"
         static let SDKVersion = Bundle.mapboxMapsMetadata.version
-        static let UserAgent = String(format: "%/%", MGLAPIClientUserAgentBase, SDKVersion)
     }
 
     /// Responsible for location and telemetry metrics events

diff --git a/Sources/MapboxMaps/Foundation/Extensions/Bundle+MapboxMaps.swift b/Sources/MapboxMaps/Foundation/Extensions/Bundle+MapboxMaps.swift
@@ -25,8 +25,14 @@ extension Bundle {
     }
 
     static var mapboxMapsMetadata: MapboxMapsMetadata = {
-        let metadataPath = Bundle.mapboxMaps.url(forResource: "MapboxMaps", withExtension: "json")!
-        let data = try! Data(contentsOf: metadataPath)
-        return try! JSONDecoder().decode(MapboxMapsMetadata.self, from: data)
+        guard let metadataPath = Bundle.mapboxMaps.url(forResource: "MapboxMaps", withExtension: "json") else {
+            return MapboxMapsMetadata(version: "unknown.ios-metatadata-failure")
+        }
+        do {
+            let data = try Data(contentsOf: metadataPath)
+            return try JSONDecoder().decode(MapboxMapsMetadata.self, from: data)
+        } catch {
+            return MapboxMapsMetadata(version: "unknown.ios-metatadata-failure")
+        }
     }()
 }