Fix broken Google Calendar onboarding

Author: leits

MeetingBar.xcodeproj/project.pbxproj

@@ -453,7 +453,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 166;
+				CURRENT_PROJECT_VERSION = 167;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -467,7 +467,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 4.11.3;
+				MARKETING_VERSION = 4.11.4;
 				PRODUCT_BUNDLE_IDENTIFIER = leits.MeetingBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -483,7 +483,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 166;
+				CURRENT_PROJECT_VERSION = 167;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -497,7 +497,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 4.11.3;
+				MARKETING_VERSION = 4.11.4;
 				PRODUCT_BUNDLE_IDENTIFIER = leits.MeetingBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

MeetingBar/App/AppDelegate.swift

@@ -43,6 +43,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, @preconcurrency UNUserNotifi
 
         statusBarItem = StatusBarItemController()
 
+        NSAppleEventManager.shared().setEventHandler(
+            self,
+            andSelector: #selector(AppDelegate.handleURLEvent(getURLEvent:replyEvent:)),
+            forEventClass: AEEventClass(kInternetEventClass),
+            andEventID: AEEventID(kAEGetURL)
+        )
+
         if Defaults[.onboardingCompleted] {
             Task {
                 eventManager = await EventManager()
@@ -56,13 +63,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, @preconcurrency UNUserNotifi
     func setup() {
         statusBarItem.setAppDelegate(appdelegate: self)
 
-        NSAppleEventManager.shared().setEventHandler(
-            self,
-            andSelector: #selector(AppDelegate.handleURLEvent(getURLEvent:replyEvent:)),
-            forEventClass: AEEventClass(kInternetEventClass),
-            andEventID: AEEventID(kAEGetURL)
-        )
-
         UNUserNotificationCenter.current().delegate = self
         Task { @MainActor in
             await ensureNotificationAuthorization()

MeetingBar/UI/Views/Onboarding/AccessScreen.swift

@@ -90,9 +90,9 @@ struct AccessScreen: View {
         Defaults[.eventStoreProvider] = provider
         if let app = NSApplication.shared.delegate as! AppDelegate? {
             app.eventManager = await EventManager()
-            await app.eventManager.changeEventStoreProvider(Defaults[.eventStoreProvider])
             Defaults[.onboardingCompleted] = true
             app.setup()
+            await app.eventManager.changeEventStoreProvider(Defaults[.eventStoreProvider])
             self.viewRouter.currentScreen = .calendars
         }
     }