Improve connectedAndInstalledNodes to only query/listen to a single c…

…apability (#2000)
google · Jan 23, 2024 · 28d3d56 · 28d3d56
1 parent 4409a2c
commit 28d3d56
Show file tree

Hide file tree

Showing 7 changed files with 263 additions and 240 deletions.
diff --git a/datalayer/core/api/current.api b/datalayer/core/api/current.api
@@ -139,8 +139,9 @@ package com.google.android.horologist.data.apphelper {
   public abstract class DataLayerAppHelper {
     ctor public DataLayerAppHelper(android.content.Context context, com.google.android.horologist.data.WearDataLayerRegistry registry);
     method protected final void checkIsForegroundOrThrow();
+    method protected final kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> connectedAndInstalledNodes(String capability);
     method public final suspend Object? connectedNodes(kotlin.coroutines.Continuation<? super java.util.List<? extends com.google.android.horologist.data.apphelper.AppHelperNodeStatus>>);
-    method public final kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> getConnectedAndInstalledNodes();
+    method public abstract kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> getConnectedAndInstalledNodes();
     method protected final android.content.Context getContext();
     method protected final String getPlayStoreUri();
     method protected final com.google.android.horologist.data.WearDataLayerRegistry getRegistry();
@@ -151,7 +152,7 @@ package com.google.android.horologist.data.apphelper {
     method @CheckResult public abstract suspend Object? startCompanion(String nodeId, kotlin.coroutines.Continuation<? super error.NonExistentClass>);
     method @CheckResult public final suspend Object? startRemoteActivity(String nodeId, error.NonExistentClass config, kotlin.coroutines.Continuation<? super error.NonExistentClass>);
     method @CheckResult public final suspend Object? startRemoteOwnApp(String nodeId, kotlin.coroutines.Continuation<? super error.NonExistentClass>);
-    property public final kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> connectedAndInstalledNodes;
+    property public abstract kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> connectedAndInstalledNodes;
     property protected final android.content.Context context;
     property protected final String playStoreUri;
     property protected final com.google.android.horologist.data.WearDataLayerRegistry registry;

diff --git a/...yer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt b/...yer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt
@@ -19,7 +19,6 @@ package com.google.android.horologist.data.apphelper
 import android.app.ActivityManager
 import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
 import android.content.Context
-import android.net.Uri
 import android.os.Process
 import androidx.annotation.CheckResult
 import androidx.wear.remote.interactions.RemoteActivityHelper
@@ -39,6 +38,7 @@ import com.google.android.horologist.data.launchRequest
 import com.google.android.horologist.data.ownAppConfig
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.tasks.await
@@ -56,8 +56,6 @@ abstract class DataLayerAppHelper(
     protected val context: Context,
     protected val registry: WearDataLayerRegistry,
 ) {
-    private val installedDeviceCapabilityUri: String = "wear://*/$CAPABILITY_DEVICE_PREFIX"
-
     private val activityManager: ActivityManager by lazy { context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager }
 
     protected val playStoreUri: String = "market://details?id=${context.packageName}"
@@ -106,32 +104,42 @@ abstract class DataLayerAppHelper(
     /**
      * Creates a flow to keep the client updated with the set of connected devices with the app
      * installed.
+     *
+     * When called from a phone device, multiple watches can be connected to it.
+     *
+     * When called from a watch device, usually only a single phone device will be connected to it.
      */
-    public val connectedAndInstalledNodes = callbackFlow<Set<Node>> {
-        val listener: CapabilityClient.OnCapabilityChangedListener =
-            CapabilityClient.OnCapabilityChangedListener { capability ->
-                @Suppress("UNUSED_VARIABLE")
-                val unused =
-                    trySend(capability.nodes.filter { it.isNearby }.toSet())
-            }
+    public abstract val connectedAndInstalledNodes: Flow<Set<Node>>
+
+    protected fun connectedAndInstalledNodes(capability: String) = callbackFlow<Set<Node>> {
+        suspend fun sendNearbyNodes() {
+            val capabilityInfo = registry.capabilityClient.getCapability(
+                capability,
+                CapabilityClient.FILTER_REACHABLE,
+            ).await()
+
+            val nearbyNodes = capabilityInfo.nodes.filter { it.isNearby }.toSet()
 
-        val allCaps = registry.capabilityClient.getAllCapabilities(
-            CapabilityClient.FILTER_REACHABLE,
-        ).await()
-        val installedCaps =
-            allCaps.filter { it.key.startsWith(CAPABILITY_DEVICE_PREFIX) }.values.flatMap { it.nodes }
-                .filter { it.isNearby }.toSet()
+            @Suppress("UNUSED_VARIABLE")
+            val unused = trySend(nearbyNodes)
+        }
+
+        suspend fun listenAndSendChanges() {
+            val listener: CapabilityClient.OnCapabilityChangedListener =
+                CapabilityClient.OnCapabilityChangedListener { capability ->
+                    @Suppress("UNUSED_VARIABLE")
+                    val unused = trySend(capability.nodes.filter { it.isNearby }.toSet())
+                }
 
-        @Suppress("UNUSED_VARIABLE")
-        val unused = trySend(installedCaps)
-        registry.capabilityClient.addListener(
-            listener,
-            Uri.parse(installedDeviceCapabilityUri),
-            CapabilityClient.FILTER_PREFIX,
-        )
-        awaitClose {
-            registry.capabilityClient.removeListener(listener)
+            registry.capabilityClient.addListener(listener, capability)
+            awaitClose {
+                registry.capabilityClient.removeListener(listener)
+            }
         }
+
+        sendNearbyNodes()
+
+        listenAndSendChanges()
     }
 
     /**

diff --git a/datalayer/phone/api/current.api b/datalayer/phone/api/current.api
@@ -3,8 +3,10 @@ package com.google.android.horologist.datalayer.phone {
 
   @com.google.android.horologist.annotations.ExperimentalHorologistApi public final class PhoneDataLayerAppHelper extends com.google.android.horologist.data.apphelper.DataLayerAppHelper {
     ctor public PhoneDataLayerAppHelper(android.content.Context context, com.google.android.horologist.data.WearDataLayerRegistry registry);
+    method public kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> getConnectedAndInstalledNodes();
     method public suspend Object? installOnNode(String nodeId, kotlin.coroutines.Continuation<? super com.google.android.horologist.data.AppHelperResultCode>);
     method @CheckResult public suspend Object? startCompanion(String nodeId, kotlin.coroutines.Continuation<? super com.google.android.horologist.data.AppHelperResultCode>);
+    property public kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> connectedAndInstalledNodes;
   }
 
   public final class PhoneDataLayerListenerService extends com.google.android.horologist.data.apphelper.DataLayerAppHelperService {

diff --git a/...ne/src/main/java/com/google/android/horologist/datalayer/phone/PhoneDataLayerAppHelper.kt b/...ne/src/main/java/com/google/android/horologist/datalayer/phone/PhoneDataLayerAppHelper.kt
@@ -23,12 +23,16 @@ import android.net.Uri
 import androidx.annotation.CheckResult
 import androidx.concurrent.futures.await
 import androidx.wear.remote.interactions.RemoteActivityHelper
+import com.google.android.gms.wearable.Node
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.data.AppHelperResultCode
 import com.google.android.horologist.data.WearDataLayerRegistry
 import com.google.android.horologist.data.apphelper.DataLayerAppHelper
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.tasks.await
 
+private const val SAMSUNG_COMPANION_PKG = "com.samsung.android.app.watchmanager"
+
 /**
  * Subclass of [DataLayerAppHelper] for use on phones.
  */
@@ -37,7 +41,9 @@ public class PhoneDataLayerAppHelper(
     context: Context,
     registry: WearDataLayerRegistry,
 ) : DataLayerAppHelper(context, registry) {
-    private val SAMSUNG_COMPANION_PKG = "com.samsung.android.app.watchmanager"
+
+    override val connectedAndInstalledNodes: Flow<Set<Node>>
+        get() = connectedAndInstalledNodes(WATCH_CAPABILITY)
 
     override suspend fun installOnNode(nodeId: String): AppHelperResultCode {
         checkIsForegroundOrThrow()

diff --git a/...m/google/android/horologist/datalayer/sample/screens/nodeslistener/NodesListenerScreen.kt b/...m/google/android/horologist/datalayer/sample/screens/nodeslistener/NodesListenerScreen.kt
@@ -85,10 +85,11 @@ fun NodesListenerScreen(
             }
 
             is NodesListenerScreenState.Loaded -> {
+                item {
+                    Text(stringResource(id = R.string.nodes_listener_screen_message))
+                }
+
                 if (state.nodeList.isNotEmpty()) {
-                    item {
-                        Text(stringResource(id = R.string.nodes_listener_screen_message))
-                    }
                     items(state.nodeList.toList()) { node ->
                         Chip(
                             label = node.displayName,

diff --git a/datalayer/watch/api/current.api b/datalayer/watch/api/current.api
@@ -3,6 +3,7 @@ package com.google.android.horologist.datalayer.watch {
 
   @com.google.android.horologist.annotations.ExperimentalHorologistApi public final class WearDataLayerAppHelper extends com.google.android.horologist.data.apphelper.DataLayerAppHelper {
     ctor public WearDataLayerAppHelper(android.content.Context context, com.google.android.horologist.data.WearDataLayerRegistry registry, kotlinx.coroutines.CoroutineScope scope, optional String? appStoreUri);
+    method public kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> getConnectedAndInstalledNodes();
     method public kotlinx.coroutines.flow.Flow<com.google.android.horologist.data.SurfacesInfo> getSurfacesInfo();
     method public suspend Object? installOnNode(String nodeId, kotlin.coroutines.Continuation<? super com.google.android.horologist.data.AppHelperResultCode>);
     method public suspend Object? markActivityLaunchedOnce(kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -13,6 +14,7 @@ package com.google.android.horologist.datalayer.watch {
     method public suspend Object? markTileAsInstalled(String tileName, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public suspend Object? markTileAsRemoved(String tileName, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method @CheckResult public suspend Object? startCompanion(String nodeId, kotlin.coroutines.Continuation<? super com.google.android.horologist.data.AppHelperResultCode>);
+    property public kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> connectedAndInstalledNodes;
     property public final kotlinx.coroutines.flow.Flow<com.google.android.horologist.data.SurfacesInfo> surfacesInfo;
   }