Use the last request logic still, too, of course

home-assistant · May 27, 2022 · a931580 · a931580
1 parent b31e62d
commit a931580
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Sources/App/Settings/Eureka/AccountRow.swift b/Sources/App/Settings/Eureka/AccountRow.swift
@@ -1,3 +1,4 @@
+import Alamofire
 import Eureka
 import Foundation
 import HAKit
@@ -181,7 +182,7 @@ final class HomeAssistantAccountRow: Row<AccountCell>, RowType {
             self.cachedUserName = user.name
             self.updateCell()
 
-            var lastTask: URLSessionDataTask? {
+            var lastTask: Request? {
                 didSet {
                     oldValue?.cancel()
                     lastTask?.resume()
@@ -205,13 +206,13 @@ final class HomeAssistantAccountRow: Row<AccountCell>, RowType {
                     }
                 }.map { path throws -> URL in
                     let url = server.info.connection.activeURL().appendingPathComponent(path)
-                    if let lastTask = lastTask, lastTask.error == nil, lastTask.originalRequest?.url == url {
+                    if let lastTask = lastTask, lastTask.error == nil, lastTask.request?.url == url {
                         throw FetchAvatarError.alreadySet
                     }
                     return url
                 }.then { url -> Promise<Data> in
                     Promise<Data> { seal in
-                        api.manager.download(url).validate().responseData { result in
+                        lastTask = api.manager.download(url).validate().responseData { result in
                             seal.resolve(result.result)
                         }
                     }