Fix "conflict with KVO"

boxpro · Jul 31, 2023 · 97b8a36 · 97b8a36
1 parent 7383909
commit 97b8a36
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/Calendr.xcodeproj/project.pbxproj b/Calendr.xcodeproj/project.pbxproj
@@ -1259,7 +1259,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.0;
+				MARKETING_VERSION = 1.10.1;
 				PRODUCT_BUNDLE_IDENTIFIER = br.paker.Calendr;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Calendr/Config/Calendr-Bridging-Header.h";
@@ -1285,7 +1285,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.10.0;
+				MARKETING_VERSION = 1.10.1;
 				PRODUCT_BUNDLE_IDENTIFIER = br.paker.Calendr;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Calendr/Config/Calendr-Bridging-Header.h";
@@ -1380,7 +1380,7 @@
 			repositoryURL = "https://github.com/ReactiveX/RxSwift";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 6.2.0;
+				minimumVersion = 6.6.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/Calendr.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Calendr.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/ReactiveX/RxSwift",
       "state" : {
-        "revision" : "b4307ba0b6425c0ba4178e138799946c3da594f8",
-        "version" : "6.5.0"
+        "revision" : "9dcaa4b333db437b0fbfaf453fad29069044a8b4",
+        "version" : "6.6.0"
       }
     }
   ],

diff --git a/Calendr/Main/MainViewController.swift b/Calendr/Main/MainViewController.swift
@@ -124,6 +124,10 @@ class MainViewController: NSViewController, NSPopoverDelegate {
             calendarsViewModel: calendarPickerViewModel,
             notificationCenter: notificationCenter
         )
+        /// Fix weird "conflict with KVO" issue on RxSwift if we present settings
+        /// view controller before calling `methodInvoked` at least once.
+        /// If we don't do this, the app crashes in `setUpPopover`.
+        settingsViewController.rx.viewDidLoad.subscribe().dispose()
 
         let (hoverObservable, hoverObserver) = PublishSubject<Date?>.pipe()
 
@@ -486,16 +490,13 @@ class MainViewController: NSViewController, NSPopoverDelegate {
     @objc func mainStatusItemAction() {
         guard let event = NSApp.currentEvent else { return }
 
-        // try to avoid weird "conflict with KVO" bug from RxSwift
-        DispatchQueue.main.async {
-            switch event.type {
-            case .leftMouseUp:
-                self.mainStatusItemLeftClick.onNext(())
-            case .rightMouseUp:
-                self.mainStatusItemRightClick.onNext(())
-            default:
-                break
-            }
+        switch event.type {
+        case .leftMouseUp:
+            self.mainStatusItemLeftClick.onNext(())
+        case .rightMouseUp:
+            self.mainStatusItemRightClick.onNext(())
+        default:
+            break
         }
     }
 
@@ -561,16 +562,13 @@ class MainViewController: NSViewController, NSPopoverDelegate {
     @objc func eventStatusItemAction() {
         guard let event = NSApp.currentEvent else { return }
 
-        // try to avoid weird "conflict with KVO" bug from RxSwift
-        DispatchQueue.main.async {
-            switch event.type {
-            case .leftMouseUp:
-                self.eventStatusItemLeftClick.onNext(())
-            case .rightMouseUp:
-                self.eventStatusItemRightClick.onNext(())
-            default:
-                break
-            }
+        switch event.type {
+        case .leftMouseUp:
+            self.eventStatusItemLeftClick.onNext(())
+        case .rightMouseUp:
+            self.eventStatusItemRightClick.onNext(())
+        default:
+            break
         }
     }