Merge pull request ViennaRSS#1686 from Eitot/feature/kvo

Add ObserverContext to KVO handlers
josh64x2 · May 27, 2023 · 9a0ebb0 · 9a0ebb0
2 parents e75d326 + 35df7fa
commit 9a0ebb0
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 23 deletions.
diff --git a/Vienna/Sources/Application/AppController.m b/Vienna/Sources/Application/AppController.m
@@ -61,6 +61,8 @@
 
 #define VNA_LOG os_log_create("--", "AppController")
 
+static void *VNAAppControllerObserverContext = &VNAAppControllerObserverContext;
+
 @interface AppController () <InfoPanelControllerDelegate, ActivityPanelControllerDelegate, NSMenuItemValidation, NSToolbarItemValidation>
 
 -(void)installScriptsFolderWatcher;
@@ -296,7 +298,7 @@ -(void)applicationDidFinishLaunching:(NSNotification *)aNot
     [self.pluginManager addObserver:self
                          forKeyPath:NSStringFromSelector(@selector(numberOfPlugins))
                             options:0
-                            context:nil];
+                            context:VNAAppControllerObserverContext];
 
 	// Load the styles into the main menu.
     [self populateStyleMenu];
@@ -1197,7 +1199,16 @@ - (void)populatePluginsMenu {
 - (void)observeValueForKeyPath:(NSString *)keyPath
                       ofObject:(id)object
                         change:(NSDictionary<NSKeyValueChangeKey,id> *)change
-                       context:(void *)context {
+                       context:(void *)context
+{
+    if (context != VNAAppControllerObserverContext) {
+        [super observeValueForKeyPath:keyPath
+                             ofObject:object
+                               change:change
+                              context:context];
+        return;
+    }
+
     if ([keyPath isEqualToString:NSStringFromSelector(@selector(numberOfPlugins))]) {
         NSMenu *menu = ((ViennaApp *)NSApp).articleMenu;
 
@@ -3383,7 +3394,8 @@ - (FoldersTree *)foldersTree {
 -(void)dealloc
 {
     [self.pluginManager removeObserver:self
-                            forKeyPath:NSStringFromSelector(@selector(numberOfPlugins))];
+                            forKeyPath:NSStringFromSelector(@selector(numberOfPlugins))
+                               context:VNAAppControllerObserverContext];
 
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 }

diff --git a/Vienna/Sources/Main window/ArticleController.m b/Vienna/Sources/Main window/ArticleController.m
@@ -39,6 +39,8 @@
 
 #define VNA_LOG os_log_create("--", "ArticleController")
 
+static void *VNAArticleControllerObserverContext = &VNAArticleControllerObserverContext;
+
 @interface ArticleController ()
 
 -(NSArray *)applyFilter:(NSArray *)unfilteredArray;
@@ -130,7 +132,7 @@ -(instancetype)init
         [NSUserDefaults.standardUserDefaults addObserver:self
                                               forKeyPath:MAPref_FilterMode
                                                  options:0
-                                                 context:nil];
+                                                 context:VNAArticleControllerObserverContext];
 
         queue = dispatch_queue_create("uk.co.opencommunity.vienna2.displayRefresh", DISPATCH_QUEUE_SERIAL);
         requireSelectArticleAfterReload = NO;
@@ -1081,7 +1083,16 @@ - (BOOL)filterArticle:(Article *)article usingMode:(NSInteger)filterMode {
 - (void)observeValueForKeyPath:(NSString *)keyPath
                       ofObject:(id)object
                         change:(NSDictionary<NSKeyValueChangeKey,id> *)change
-                       context:(void *)context {
+                       context:(void *)context
+{
+    if (context != VNAArticleControllerObserverContext) {
+        [super observeValueForKeyPath:keyPath
+                             ofObject:object
+                               change:change
+                              context:context];
+        return;
+    }
+
     if ([keyPath isEqualToString:MAPref_FilterMode]) {
         // Update the list of articles when the user changes the filter.
         @synchronized(mainArticleView) {
@@ -1093,7 +1104,8 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
 - (void)dealloc {
     [NSNotificationCenter.defaultCenter removeObserver:self];
     [NSUserDefaults.standardUserDefaults removeObserver:self
-                                             forKeyPath:MAPref_FilterMode];
+                                             forKeyPath:MAPref_FilterMode
+                                                context:VNAArticleControllerObserverContext];
 }
 
 @end
diff --git a/Vienna/Sources/Main window/ArticleListView.m b/Vienna/Sources/Main window/ArticleListView.m
@@ -42,7 +42,7 @@
 // Shared defaults key
 NSString * const MAPref_ShowEnclosureBar = @"ShowEnclosureBar";
 
-static void *ObserverContext = &ObserverContext;
+static void *VNAArticleListViewObserverContext = &VNAArticleListViewObserverContext;
 
 @interface ArticleListView ()
 
@@ -181,11 +181,11 @@ -(void)initialiseArticleView
     [userDefaults addObserver:self
                    forKeyPath:MAPref_ShowEnclosureBar
                       options:NSKeyValueObservingOptionNew
-                      context:ObserverContext];
+                      context:VNAArticleListViewObserverContext];
     [userDefaults addObserver:self
                    forKeyPath:MAPref_ShowUnreadArticlesInBold
                       options:0
-                      context:ObserverContext];
+                      context:VNAArticleListViewObserverContext];
 }
 
 /* initTableView
@@ -1587,10 +1587,10 @@ -(void)dealloc
     NSUserDefaults *userDefaults = NSUserDefaults.standardUserDefaults;
     [userDefaults removeObserver:self
                       forKeyPath:MAPref_ShowEnclosureBar
-                         context:ObserverContext];
+                         context:VNAArticleListViewObserverContext];
     [userDefaults removeObserver:self
                       forKeyPath:MAPref_ShowUnreadArticlesInBold
-                         context:ObserverContext];
+                         context:VNAArticleListViewObserverContext];
 	[splitView2 setDelegate:nil];
 	[articleList setDelegate:nil];
 }
@@ -1602,7 +1602,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
                         change:(NSDictionary<NSKeyValueChangeKey,id> *)change
                        context:(void *)context
 {
-    if (context != ObserverContext) {
+    if (context != VNAArticleListViewObserverContext) {
         [super observeValueForKeyPath:keyPath
                              ofObject:object
                                change:change

diff --git a/Vienna/Sources/Main window/FolderView.m b/Vienna/Sources/Main window/FolderView.m
@@ -33,8 +33,6 @@
 VNAFeedListRowHeight const VNAFeedListRowHeightSmall = 24.0;
 VNAFeedListRowHeight const VNAFeedListRowHeightMedium = 28.0;
 
-static void *ObserverContext = &ObserverContext;
-
 @interface FolderView ()
 
 @property (weak, nonatomic) IBOutlet NSView *floatingResetButtonView;

diff --git a/Vienna/Sources/Main window/FoldersTree.m b/Vienna/Sources/Main window/FoldersTree.m
@@ -37,7 +37,7 @@
 NSString * const MAPref_FeedListSizeMode = @"FeedListSizeMode";
 NSString * const MAPref_ShowFeedsWithUnreadItemsInBold = @"ShowFeedsWithUnreadItemsInBold";
 
-static void *ObserverContext = &ObserverContext;
+static void *VNAFoldersTreeObserverContext = &VNAFoldersTreeObserverContext;
 
 @interface FoldersTree ()
 
@@ -122,11 +122,11 @@ -(void)initialiseFoldersTree
     [userDefaults addObserver:self
                    forKeyPath:MAPref_FeedListSizeMode
                       options:0
-                      context:ObserverContext];
+                      context:VNAFoldersTreeObserverContext];
     [userDefaults addObserver:self
                    forKeyPath:MAPref_ShowFeedsWithUnreadItemsInBold
                       options:0
-                      context:ObserverContext];
+                      context:VNAFoldersTreeObserverContext];
 }
 
 - (void)dealloc
@@ -136,10 +136,10 @@ - (void)dealloc
     NSUserDefaults *userDefaults;
     [userDefaults removeObserver:self
                       forKeyPath:MAPref_FeedListSizeMode
-                         context:ObserverContext];
+                         context:VNAFoldersTreeObserverContext];
     [userDefaults removeObserver:self
                       forKeyPath:MAPref_ShowFeedsWithUnreadItemsInBold
-                         context:ObserverContext];
+                         context:VNAFoldersTreeObserverContext];
 }
 
 -(void)handleOpenReaderFolderChange:(NSNotification *)nc
@@ -1061,7 +1061,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
                         change:(NSDictionary<NSKeyValueChangeKey,id> *)change
                        context:(void *)context
 {
-    if (context != ObserverContext) {
+    if (context != VNAFoldersTreeObserverContext) {
         [super observeValueForKeyPath:keyPath
                              ofObject:object
                                change:change

diff --git a/Vienna/Sources/Main window/UnifiedDisplayView.m b/Vienna/Sources/Main window/UnifiedDisplayView.m
@@ -40,6 +40,8 @@
 #define YPOS_IN_CELL	2.0
 #define PROGRESS_INDICATOR_DIMENSION 16
 
+static void *VNAUnifiedDisplayViewObserverContext = &VNAUnifiedDisplayViewObserverContext;
+
 @interface UnifiedDisplayView () <CustomWKHoverUIDelegate>
 
 @property (nonatomic) OverlayStatusBar *statusBar;
@@ -143,7 +145,7 @@ -(void)initTableView
     [NSUserDefaults.standardUserDefaults addObserver:self
                                           forKeyPath:MAPref_ShowStatusBar
                                              options:NSKeyValueObservingOptionInitial
-                                             context:nil];
+                                             context:VNAUnifiedDisplayViewObserverContext];
 }
 
 /* dealloc
@@ -152,7 +154,8 @@ -(void)initTableView
 -(void)dealloc
 {
     [NSUserDefaults.standardUserDefaults removeObserver:self
-                                             forKeyPath:MAPref_ShowStatusBar];
+                                             forKeyPath:MAPref_ShowStatusBar
+                                                context:VNAUnifiedDisplayViewObserverContext];
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 	[articleList setDataSource:nil];
 	[articleList setDelegate:nil];
@@ -787,7 +790,16 @@ -(void)keyDown:(NSEvent *)theEvent
 - (void)observeValueForKeyPath:(NSString *)keyPath
                       ofObject:(id)object
                         change:(NSDictionary<NSKeyValueChangeKey,id> *)change
-                       context:(void *)context {
+                       context:(void *)context
+{
+    if (context != VNAUnifiedDisplayViewObserverContext) {
+        [super observeValueForKeyPath:keyPath
+                             ofObject:object
+                               change:change
+                              context:context];
+        return;
+    }
+
     if ([keyPath isEqualToString:MAPref_ShowStatusBar]) {
         BOOL isStatusBarShown = [Preferences standardPreferences].showStatusBar;
         if (isStatusBarShown && !self.statusBar) {