fix crash of app in macOS 15

lukepistrol · Sep 26, 2024 · 440157c · 440157c
1 parent caf8a3a
commit 440157c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/TimeMachineStatus/Extensions/Color+RawRepresentable.swift b/TimeMachineStatus/Extensions/Color+RawRepresentable.swift
@@ -11,7 +11,7 @@
 
 import SwiftUI
 
-extension Color: RawRepresentable {
+extension Color: @retroactive RawRepresentable {
     public init?(rawValue: String) {
         guard let data = Data(base64Encoded: rawValue) else {
             self = .black

diff --git a/TimeMachineStatus/Model/BackupState/Internal/_InProgressState.swift b/TimeMachineStatus/Model/BackupState/Internal/_InProgressState.swift
@@ -20,17 +20,20 @@ extension BackupState {
 
         required init(from decoder: Decoder) throws {
             let container = try decoder.container(keyedBy: CodingKeys.self)
-            let stateChangeString = try container.decode(String.self, forKey: .stateChange)
-            self.stateChange = if let date = _dateFormatter.date(from: stateChangeString) {
-                date
+            if let stateChangeString = try container.decodeIfPresent(String.self, forKey: .stateChange) {
+                self.stateChange = if let date = _dateFormatter.date(from: stateChangeString) {
+                    date
+                } else {
+                    throw BackupStateError.couldNotConvertStringToDate(string: stateChangeString)
+                }
             } else {
-                throw BackupStateError.couldNotConvertStringToDate(string: stateChangeString)
+                self.stateChange = nil
             }
             self.destinationMountPoint = try container.decode(String.self, forKey: .destinationMountPoint)
             try super.init(from: decoder)
         }
 
-        let stateChange: Date
+        let stateChange: Date?
         let destinationMountPoint: String
     }
 }
diff --git a/TimeMachineStatus/Model/BackupState/Internal/_State.swift b/TimeMachineStatus/Model/BackupState/Internal/_State.swift
@@ -65,9 +65,10 @@ extension BackupState {
                     return ._finishing
                 case "Stopping":
                     return ._stopping
-                case "ThinningPostBackup":
+                case "ThinningPostBackup", "LazyThinning":
                     return ._thinning
                 default:
+                    log.error("Unknown phase: \(phase)")
                     fatalError("Unknown phase: \(phase)")
                 }
             } else {