fix: explicitly unwrap double optional for swift 4 compilation

amplitude · Mar 14, 2024 · de347f9 · de347f9
1 parent 6491bce
commit de347f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Sources/Experiment/EvaluationEngine.swift b/Sources/Experiment/EvaluationEngine.swift
@@ -293,14 +293,16 @@ internal class EvaluationEngine {
         guard let dataValue = coerceString(value: value)?.data(using: .utf8) else {
             return nil
         }
-        if let nsArray = try? JSONSerialization.jsonObject(with: dataValue) as? NSArray {
-            var result = Set<String>()
-            for element in nsArray {
-                if let stringElement = coerceString(value: element) {
-                    result.insert(stringElement)
+        if let opt = try? JSONSerialization.jsonObject(with: dataValue) {
+            if let nsArray = opt as? NSArray {
+                var result = Set<String>()
+                for element in nsArray {
+                    if let stringElement = coerceString(value: element) {
+                        result.insert(stringElement)
+                    }
                 }
+                return result
             }
-            return result
         }
 
         return nil

diff --git a/Sources/Experiment/Variant.swift b/Sources/Experiment/Variant.swift
@@ -68,9 +68,11 @@ import Foundation
         // dedcoded to a json object with one key, "payload" which contains the actual json value.
         var payload: Any? = nil
         if let data = try? values.decode(Data.self, forKey: .payload) {
-            if let objectPayload = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any?] {
-                if let subPayload = objectPayload["payload"] {
-                    payload = subPayload
+            if let opt = try? JSONSerialization.jsonObject(with: data, options: []) {
+                if let objectPayload = opt as? [String: Any?] {
+                    if let subPayload = objectPayload["payload"] {
+                        payload = subPayload
+                    }
                 }
             }
         }