Clear cache when refreshing

home-assistant · Sep 3, 2018 · 49672af · 49672af
1 parent 7c0cbbd
commit 49672af
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/HomeAssistant/Views/WebViewController.swift b/HomeAssistant/Views/WebViewController.swift
@@ -263,22 +263,24 @@ class WebViewController: UIViewController, WKNavigationDelegate, WKUIDelegate, C
     }
 
     @objc func refreshWebView(_ sender: UIBarButtonItem) {
-        if self.webView.isLoading {
-            self.webView.stopLoading()
-        } else if let connectionInfo = Current.settingsStore.connectionInfo {
-            self.webView.load(URLRequest(url: connectionInfo.activeURL))
-        } else {
-            let websiteDataTypes = NSSet(array: [WKWebsiteDataTypeDiskCache, WKWebsiteDataTypeMemoryCache])
-            let date = Date(timeIntervalSince1970: 0)
-            if let typeSet = websiteDataTypes as? Set<String> {
-                WKWebsiteDataStore.default().removeData(ofTypes: typeSet, modifiedSince: date,
-                                                        completionHandler: {
-                                                            self.webView.reload()
-                })
+        let redirectOrReload = {
+            if self.webView.isLoading {
+                self.webView.stopLoading()
+            } else if let connectionInfo = Current.settingsStore.connectionInfo {
+                self.webView.load(URLRequest(url: connectionInfo.activeURL))
             } else {
                 self.webView.reload()
             }
         }
+
+        let websiteDataTypes = NSSet(array: [WKWebsiteDataTypeDiskCache, WKWebsiteDataTypeMemoryCache])
+        let date = Date(timeIntervalSince1970: 0)
+        if let typeSet = websiteDataTypes as? Set<String> {
+            WKWebsiteDataStore.default().removeData(ofTypes: typeSet, modifiedSince: date,
+                                                    completionHandler: redirectOrReload)
+        } else {
+            redirectOrReload()
+        }
     }
 
     func openSettingsWithError(error: Error) {