From a93dfc964b2fd0e728a5f43c3eb51dbb8474e018 Mon Sep 17 00:00:00 2001 From: Bouke Haarsma Date: Sun, 19 Nov 2017 20:00:06 +0100 Subject: [PATCH] Resolve most compiler warnings --- Sources/HAP/Base/CharacteristicValueType.swift | 4 ---- Sources/HAP/Utils/Data+Extensions.swift | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Sources/HAP/Base/CharacteristicValueType.swift b/Sources/HAP/Base/CharacteristicValueType.swift index 36c4af54..3b408b8e 100644 --- a/Sources/HAP/Base/CharacteristicValueType.swift +++ b/Sources/HAP/Base/CharacteristicValueType.swift @@ -75,10 +75,6 @@ extension Float: CharacteristicValueType { extension Data: CharacteristicValueType, JSONValueTypeConvertible { public init?(value: Any) { fatalError("How does deserialization of Data work?") - guard let data = value as? Data else { - return nil - } - self = data } static public let format = CharacteristicFormat.data public var jsonValueType: JSONValueType { diff --git a/Sources/HAP/Utils/Data+Extensions.swift b/Sources/HAP/Utils/Data+Extensions.swift index 6ef61d29..3a83a2c9 100644 --- a/Sources/HAP/Utils/Data+Extensions.swift +++ b/Sources/HAP/Utils/Data+Extensions.swift @@ -17,9 +17,9 @@ extension Data { extension Data { init?(hex: String) { var result = [UInt8]() - var from = hex.characters.startIndex - while from < hex.characters.endIndex { - guard let to = hex.characters.index(from, offsetBy: 2, limitedBy: hex.characters.endIndex) else { + var from = hex.startIndex + while from < hex.endIndex { + guard let to = hex.index(from, offsetBy: 2, limitedBy: hex.endIndex) else { return nil } guard let num = UInt8(hex[from..