Fixes crash occurring when trying to update undefined server instance

Piwigo · Nov 30, 2023 · cd7a373 · cd7a373
1 parent 24f9bb9
commit cd7a373
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/piwigoKit/Data Cache/User Data/User+CoreDataClass.swift b/piwigoKit/Data Cache/User Data/User+CoreDataClass.swift
@@ -99,4 +99,12 @@ extension User {
         if self.role != .normal { return false }
         return self.uploadRights.components(separatedBy: ",").contains(String(categoryId))
     }
+
+    public func setLastUsedToNow() {
+        let dateOfLogin = Date.timeIntervalSinceReferenceDate
+        self.lastUsed = dateOfLogin
+        if let server = self.server {
+            server.lastUsed = dateOfLogin
+        }
+    }
 }
diff --git a/piwigoKit/Network/NetworkUtilities.swift b/piwigoKit/Network/NetworkUtilities.swift
@@ -98,7 +98,6 @@ public class NetworkUtilities: NSObject {
                 logger.notice("New token: \(NetworkVars.pwgToken, privacy: .private(mask: .hash))")
             }
             if username != NetworkVars.username || oldToken.isEmpty || NetworkVars.pwgToken != oldToken {
-                let dateOfLogin = Date.timeIntervalSinceReferenceDate
                 // Collect list of methods supplied by Piwigo server
                 // => Determine if Community extension 2.9a or later is installed and active
                 requestServerMethods {
@@ -111,8 +110,7 @@ public class NetworkUtilities: NSObject {
                         // Session now opened
                         getPiwigoConfig {
                             // Update date of accesss to the server by guest
-                            user?.lastUsed = dateOfLogin
-                            user?.server?.lastUsed = dateOfLogin
+                            user?.setLastUsedToNow()
                             user?.status = NetworkVars.userStatus.rawValue
                             completion()
                         } failure: { error in
@@ -129,8 +127,7 @@ public class NetworkUtilities: NSObject {
                             // Session now opened
                             getPiwigoConfig {
                                 // Update date of accesss to the server by user
-                                user?.lastUsed = dateOfLogin
-                                user?.server?.lastUsed = dateOfLogin
+                                user?.setLastUsedToNow()
                                 user?.status = NetworkVars.userStatus.rawValue
                                 completion()
                             } failure: { error in