Check for activationState in watch session

Author: itsmeichigo

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -1250,7 +1250,6 @@ enum WooAnalyticsStat: String {
     case watchConnectingOpened = "watch_connecting_opened"
     case watchSyncingFailed = "watch_syncing_failed"
     case watchMyStoreOpened = "watch_my_store_opened"
-    case watchActivationCompleted = "watch_activation_completed"
     case watchOrdersListOpened = "watch_orders_list_opened"
     case watchPushNotificationTapped = "watch_push_notification_tapped"
     case watchOrderDetailOpened = "watch_order_detail_opened"

WooCommerce/Classes/System/WatchDependenciesSynchronizer.swift

@@ -37,10 +37,6 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
     ///
     @Published var account: Account?
 
-    /// Tracks if the current watch session is active or not
-    ///
-    @Published private var isSessionActive: Bool = false
-
     /// Toggle this value to force a credentials sync.
     ///
     @Published private var syncTrigger = false
@@ -99,15 +95,17 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
             .debounce(for: 0.5, scheduler: DispatchQueue.main)
 
         // Syncs the dependencies to the paired counterpart when the session becomes available.
-        Publishers.CombineLatest3(watchDependencies, $isSessionActive, $syncTrigger)
-            .sink { [weak self, watchSession] dependencies, isSessionActive, forceSync in
+        watchDependencies.combineLatest($syncTrigger)
+            .sink { [weak self, watchSession] dependencies, forceSync in
 
                 // Do not update the context if the session is not active, the watch is not paired or the watch app is not installed.
-                guard isSessionActive, watchSession.isPaired, watchSession.isWatchAppInstalled else {
+                guard watchSession.activationState == .activated,
+                      watchSession.isPaired,
+                      watchSession.isWatchAppInstalled else {
                     self?.analytics.track(
                         .watchSyncingFailed,
                         properties: [
-                            "session_active": isSessionActive,
+                            "session_active": watchSession.activationState == .activated,
                             "session_paired": watchSession.isPaired,
                             "watch_app_installed": watchSession.isWatchAppInstalled
                         ],
@@ -147,12 +145,6 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
 
     func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {
         DDLogInfo("🔵 WatchSession activated \(activationState)")
-        analytics.track(
-            .watchActivationCompleted,
-            properties: ["state": activationState.rawValue],
-            error: error
-        )
-        self.isSessionActive = activationState == .activated
     }
 
     func sessionDidBecomeInactive(_ session: WCSession) {
@@ -161,7 +153,6 @@ final class WatchDependenciesSynchronizer: NSObject, WCSessionDelegate {
 
     func sessionDidDeactivate(_ session: WCSession) {
         // Try to guarantee an active session
-        self.isSessionActive = false
         watchSession.activate()
     }
 }
@@ -201,10 +192,8 @@ extension WatchDependenciesSynchronizer {
 
 extension WatchDependenciesSynchronizer {
     enum SyncError: Error {
-        case missingStoreDetailsOrCredentials
         case watchSessionInactiveOrNotPaired
         case noDependenciesFound
-        case invalidApplicationContext
         case encodingApplicationContextFailed
     }
 }

WooCommerce/Woo Watch App/ConnectView.swift

@@ -7,6 +7,8 @@ struct ConnectView: View {
 
     @EnvironmentObject private var tracksProvider: WatchTracksProvider
 
+    @State private var didRequestSyncing = false
+
     let synchronizer: PhoneDependenciesSynchronizer
 
     let message: String = Localization.connectMessage
@@ -18,9 +20,11 @@ struct ConnectView: View {
                     .multilineTextAlignment(.center)
                     .fixedSize(horizontal: false, vertical: true)
 
-                Text(Localization.workaroundTip)
-                    .multilineTextAlignment(.center)
-                    .fixedSize(horizontal: false, vertical: true)
+                if didRequestSyncing {
+                    Text(Localization.workaroundTip)
+                        .multilineTextAlignment(.center)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
 
                 Image(systemName: "bolt.fill")
                     .renderingMode(.original)
@@ -30,6 +34,7 @@ struct ConnectView: View {
 
                 Button(Localization.itsNotWorking) {
                     synchronizer.requestCredentialSync()
+                    didRequestSyncing = true
                 }
             }
         }