Fix incorrectly tracking reader accessed event in the WordPress app (#…

…22636)
wordpress-mobile · Feb 22, 2024 · 39f08e5 · 39f08e5
2 parents 4f4cfc0 + 015a206
commit 39f08e5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift b/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift
@@ -1,6 +1,21 @@
 
 // MARK: - Tab Access Tracking
 
+fileprivate extension WPTab {
+    var hasStaticScreen: Bool {
+        switch self {
+        case .reader:
+            return true
+        case .notifications:
+            return true
+        case .mySites:
+            return false
+        case .me:
+            return false
+        }
+    }
+}
+
 extension WPTabBarController {
     private static let tabIndexToStatMap: [WPTab: WPAnalyticsStat] = [.mySites: .mySitesTabAccessed, .reader: .readerAccessed]
 
@@ -84,6 +99,10 @@ extension WPTabBarController {
                 return false
         }
 
+        if tabType.hasStaticScreen && shouldUseStaticScreens {
+            return false
+        }
+
         WPAppAnalytics.track(stat)
 
         return true

diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.h b/WordPress/Classes/ViewRelated/System/WPTabBarController.h
@@ -31,6 +31,7 @@ extern NSNotificationName const WPTabBarHeightChangedNotification;
 @property (nonatomic, strong, readonly, nullable) ReaderCoordinator *readerCoordinator;
 @property (nonatomic, strong) id<ScenePresenter> meScenePresenter;
 @property (nonatomic, strong, readonly) ReaderTabViewModel *readerTabViewModel;
+@property (nonatomic, assign) BOOL shouldUseStaticScreens;
 
 - (instancetype)initWithStaticScreens:(BOOL)shouldUseStaticScreens;
 

diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
@@ -49,8 +49,6 @@
 
 @interface WPTabBarController () <UITabBarControllerDelegate, UIViewControllerRestoration>
 
-@property (nonatomic, assign) BOOL shouldUseStaticScreens;
-
 @property (nonatomic, strong) NotificationsViewController *notificationsViewController;
 
 @property (nonatomic, strong) UINavigationController *readerNavigationController;