Match any destination for backup state

ParetoSecurity · Jul 12, 2022 · 31ffdb8 · 31ffdb8
1 parent 34681d5
commit 31ffdb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/Pareto/Info.plist b/Pareto/Info.plist
@@ -26,7 +26,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4856</string>
+	<string>4861</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Pareto/Models/TimeMachineBackup.swift b/Pareto/Models/TimeMachineBackup.swift
@@ -64,24 +64,15 @@ struct TimeMachineConfig {
             return false
         }
 
-        let lastBackupDestination = Destinations.filter { dests in
-            dests.DestinationID == LastDestinationID
+        return Destinations.contains { d in
+            d.isUpToDateBackup
         }
-
-        return lastBackupDestination.first?.isUpToDateBackup ?? false
     }
 
     var isEncryptedBackup: Bool {
-        // no backup made yet
-        if LastDestinationID.isEmpty {
-            return false
+        return Destinations.allSatisfy { d in
+            d.isEncrypted
         }
-
-        let lastBackupDestination = Destinations.filter { dests in
-            dests.DestinationID == LastDestinationID
-        }
-
-        return lastBackupDestination.first?.isEncrypted ?? false
     }
 
     var canCheckIsEncryptedBackup: Bool {