From 5ab76d5040a2cae09aa20750c99f5a65aa4d4bd1 Mon Sep 17 00:00:00 2001
From: Robbie Trencheny <me@robbiet.us>
Date: Sun, 19 Nov 2017 17:13:48 -0800
Subject: [PATCH] Final Swiftlint fixes (yay)

---
 HomeAssistant/AppDelegate.swift     |  4 ++--
 HomeAssistant/HAAPI.swift           |  8 +++-----
 HomeAssistant/Utilities/Utils.swift | 15 ++-------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/HomeAssistant/AppDelegate.swift b/HomeAssistant/AppDelegate.swift
index 2c220fb79..f10d89f50 100644
--- a/HomeAssistant/AppDelegate.swift
+++ b/HomeAssistant/AppDelegate.swift
@@ -247,12 +247,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                                                                                coordinates: location.coordinate,
                                                                                accuracy: location.horizontalAccuracy,
                                                                                zone: nil)
-            }) { (_, _, error) -> Void in
+            }, error: { (_, _, error) -> Void in
                 // something went wrong. request will be cancelled automatically
                 NSLog("Error during significant location update registration: @%",
                       error.localizedDescription)
                 Crashlytics.sharedInstance().recordError(error)
-            }
+            })
         }
     }
 
diff --git a/HomeAssistant/HAAPI.swift b/HomeAssistant/HAAPI.swift
index 399af3e0b..dc6ff3a3b 100644
--- a/HomeAssistant/HAAPI.swift
+++ b/HomeAssistant/HAAPI.swift
@@ -204,14 +204,12 @@ public class HomeAssistantAPI {
             batteryState = "Full"
         }
 
-        let hostname = UIDevice().name
-
         let locationUpdate: [String: Any] = [
             "battery": Int(UIDevice.current.batteryLevel*100),
             "battery_status": batteryState,
             "gps": [coordinates.latitude, coordinates.longitude],
             "gps_accuracy": accuracy,
-            "hostname": hostname,
+            "hostname": UIDevice.current.name,
             "dev_id": deviceID
         ]
 
@@ -354,11 +352,11 @@ public class HomeAssistantAPI {
                                     accuracy: location.horizontalAccuracy,
                                     zone: nil)
                 fulfill(true)
-            }) { (_, _, error) in
+            }, error: { (_, _, error) in
                 print("Error when trying to get a oneshot location for \(updateTrigger) trigger!", error)
                 Crashlytics.sharedInstance().recordError(error)
                 reject(error)
-            }
+            })
         }
     }
 
diff --git a/HomeAssistant/Utilities/Utils.swift b/HomeAssistant/Utilities/Utils.swift
index 5f9be8b37..82870f910 100644
--- a/HomeAssistant/Utilities/Utils.swift
+++ b/HomeAssistant/Utilities/Utils.swift
@@ -198,8 +198,8 @@ func openURLInBrowser(urlToOpen: URL) {
 
 func removeSpecialCharsFromString(text: String) -> String {
     let okayChars: Set<Character> =
-        Set("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLKMNOPQRSTUVWXYZ1234567890".characters)
-    return String(text.characters.filter {okayChars.contains($0) })
+        Set("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLKMNOPQRSTUVWXYZ1234567890")
+    return String(text.filter {okayChars.contains($0) })
 }
 
 func convertToDictionary(text: String) -> [String: Any]? {
@@ -274,14 +274,3 @@ extension UIImage {
         return newImage
     }
 }
-
-extension String {
-
-    subscript (i: Int) -> Character {
-        return self[self.characters.index(self.startIndex, offsetBy: i)]
-    }
-
-    subscript (i: Int) -> String {
-        return String(self[i] as Character)
-    }
-}