Fix warnings.

unsplash · Dec 3, 2018 · b5dc4f5 · b5dc4f5
1 parent 75e2fc4
commit b5dc4f5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Snowplow/Payload.swift b/Snowplow/Payload.swift
@@ -80,8 +80,8 @@ extension Payload: Codable {
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
-        let contentData = try container.decode(Data.self, forKey: .content)
-        guard let decodedContent = try JSONSerialization.jsonObject(with: contentData, options: []) as? [String: Any] else {
+        let data = try container.decode(Data.self, forKey: .content)
+        guard let decodedContent = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] else {
             throw DecodingError.dataCorruptedError(forKey: CodingKeys.content, in: container, debugDescription: "")
         }
         content = decodedContent

diff --git a/Snowplow/PropertyKey.swift b/Snowplow/PropertyKey.swift
@@ -54,8 +54,8 @@ public enum PropertyKey: String {
     case referrer = "refr"
 
     // Screen view event
-    case name = "name"
-    case id   = "id"
+    case name       = "name"
+    case identifier = "id"
 
     // Structured event
     case category = "se_ca"

diff --git a/Snowplow/SelfDescribingJSON.swift b/Snowplow/SelfDescribingJSON.swift
@@ -54,7 +54,9 @@ public struct SelfDescribingJSON {
 extension SelfDescribingJSON {
 
     public var base64EncodedRepresentation: String? {
-        guard let data = try? JSONSerialization.data(withJSONObject: dictionaryRepresentation, options: []) else { return nil }
+        guard let data = try? JSONSerialization.data(withJSONObject: dictionaryRepresentation, options: []) else {
+            return nil
+        }
         return data.base64EncodedString()
     }
 

diff --git a/Snowplow/Tracker.swift b/Snowplow/Tracker.swift
@@ -96,7 +96,7 @@ extension Tracker {
                                 identifier: String? = nil) {
         var data: [PropertyKey: Any] = [.name: name]
         if let identifier = identifier {
-            data[.id] = identifier
+            data[.identifier] = identifier
         }
         let json = SelfDescribingJSON(schema: .screenView, data: data)
         let payload = Payload(json, isBase64Encoded: isBase64Encoded)