v1.8

alienator88 · Sep 23, 2024 · 4066a85 · 4066a85
1 parent 882ad24
commit 4066a85
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/Sentinel.xcodeproj/project.pbxproj b/Sentinel.xcodeproj/project.pbxproj
@@ -370,7 +370,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
@@ -386,7 +386,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alienator88.Sentinel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -406,7 +406,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
@@ -422,7 +422,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alienator88.Sentinel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/alin.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/alin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Sentinel/About Window/AboutCommand.swift b/Sentinel/About Window/AboutCommand.swift
@@ -19,7 +19,7 @@ struct AboutCommand: Commands {
             }
 
             Button {
-                updater.checkForUpdates(showSheet: false)
+                updater.checkForUpdates(showSheet: true)
             } label: {
                 Text("Check for Updates")
             }

diff --git a/Sentinel/Dashboard.swift b/Sentinel/Dashboard.swift
@@ -230,9 +230,11 @@ struct DropQuarantine: DropDelegate {
                     print("Error: Not a valid URL.")
                     return
                 }
+                updateOnMain {
+                    appState.status = "Attempting to remove app from quarantine"
+                }
                 Task
                 {
-                    appState.status = "Attempting to remove app from quarantine"
                     _ = await CmdRunDrop(cmd: "xattr -rd com.apple.quarantine \(url.path)", type: "quarantine", appState: appState)
                 }
 
@@ -265,9 +267,11 @@ struct DropSign: DropDelegate {
                     print("Error: Not a valid URL.")
                     return
                 }
+                updateOnMain {
+                    appState.status = "Attempting to self-sign the app"
+                }
                 Task
                 {
-                    appState.status = "Attempting to self-sign the app"
                     _ = await CmdRunDrop(cmd: "codesign -f -s - --deep \(url.path)", type: "sign", appState: appState)
                 }
 

diff --git a/Sentinel/SentinelApp.swift b/Sentinel/SentinelApp.swift
@@ -7,6 +7,7 @@ struct SentinelApp: App {
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @StateObject var appState = AppState()
     @StateObject private var updater = Updater(owner: "alienator88", repo: "Sentinel")
+    @StateObject private var themeManager = ThemeManager.shared
 
     var body: some Scene {
         WindowGroup {
@@ -15,6 +16,11 @@ struct SentinelApp: App {
                     .environmentObject(appState)
                     .environmentObject(updater)
             }
+            .sheet(isPresented: $updater.showSheet, content: {
+                /// This will show the update sheet based on the frequency check function only
+                updater.getUpdateView()
+                    .environmentObject(themeManager)
+            })
         }
         .commands {
             AboutCommand(appState: appState, updater: updater)