Bugfix: Exporting URIs without escaping slashes

NordicSemiconductor · Oct 10, 2023 · 4910ccb · 4910ccb
1 parent 8f24ae5
commit 4910ccb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Example/Tests/Exporting.swift b/Example/Tests/Exporting.swift
@@ -419,6 +419,7 @@ class Exporting: XCTestCase {
         // Compare the generated JSON outputs.
         let encoder = JSONEncoder()
         encoder.dateEncodingStrategy = .iso8601
+        encoder.outputFormatting = .withoutEscapingSlashes
 
         var originalData, copyData: Data?
         XCTAssertNoThrow(originalData = try encoder.encode(meshNetwork))

diff --git a/nRFMeshProvision/MeshNetworkManager.swift b/nRFMeshProvision/MeshNetworkManager.swift
@@ -1171,6 +1171,7 @@ public extension MeshNetworkManager {
     func save() -> Bool {
         let encoder = JSONEncoder()
         encoder.dateEncodingStrategy = .iso8601
+        encoder.outputFormatting = .withoutEscapingSlashes
 
         let data = try! encoder.encode(meshData)
         return storage.save(data)
@@ -1203,8 +1204,9 @@ public extension MeshNetworkManager {
     func export() -> Data {
         let encoder = JSONEncoder()
         encoder.dateEncodingStrategy = .iso8601
+        encoder.outputFormatting = .withoutEscapingSlashes
         if #available(iOS 11.0, *) {
-            encoder.outputFormatting = .sortedKeys
+            encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes]
         }
 
         return try! encoder.encode(meshData.meshNetwork)
@@ -1232,8 +1234,9 @@ public extension MeshNetworkManager {
     func export(_ configuration: ExportConfiguration) -> Data {
         let encoder = JSONEncoder()
         encoder.dateEncodingStrategy = .iso8601
+        encoder.outputFormatting = .withoutEscapingSlashes
         if #available(iOS 11.0, *) {
-            encoder.outputFormatting = .sortedKeys
+            encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes]
         }
 
         let meshNetwork = meshData.meshNetwork?.copy(using: configuration)