From 1a5fb0ff16c00fc64a4add564bd1a08af489f70b Mon Sep 17 00:00:00 2001 From: Gustavo Pagani Date: Thu, 29 Feb 2024 08:10:21 +0000 Subject: [PATCH] Remove AppInstallationStatusNodeType.UNKNOWN (#2073) --- datalayer/core/api/current.api | 1 - .../horologist/data/apphelper/AppHelperNodeStatus.kt | 6 ------ .../android/horologist/data/apphelper/DataLayerAppHelper.kt | 3 +-- .../sample/screens/nodesactions/NodesActionViewModel.kt | 1 - 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/datalayer/core/api/current.api b/datalayer/core/api/current.api index 1297334f09..8296bfac7e 100644 --- a/datalayer/core/api/current.api +++ b/datalayer/core/api/current.api @@ -135,7 +135,6 @@ package com.google.android.horologist.data.apphelper { method public static com.google.android.horologist.data.apphelper.AppInstallationStatusNodeType valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException; method public static com.google.android.horologist.data.apphelper.AppInstallationStatusNodeType[] values(); enum_constant public static final com.google.android.horologist.data.apphelper.AppInstallationStatusNodeType PHONE; - enum_constant public static final com.google.android.horologist.data.apphelper.AppInstallationStatusNodeType UNKNOWN; enum_constant public static final com.google.android.horologist.data.apphelper.AppInstallationStatusNodeType WATCH; } diff --git a/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/AppHelperNodeStatus.kt b/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/AppHelperNodeStatus.kt index c12819d4bc..42dc2b5309 100644 --- a/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/AppHelperNodeStatus.kt +++ b/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/AppHelperNodeStatus.kt @@ -41,12 +41,6 @@ public sealed class AppInstallationStatus { public enum class AppInstallationStatusNodeType { WATCH, PHONE, - - /** - * This case should not happen, but it's here in order to keep the node listed even in a - * scenario where there were issues retrieving the capability of the node. - */ - UNKNOWN, } public val AppHelperNodeStatus.appInstalled: Boolean diff --git a/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt b/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt index 279a0b0e24..757abecc38 100644 --- a/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt +++ b/datalayer/core/src/main/java/com/google/android/horologist/data/apphelper/DataLayerAppHelper.kt @@ -77,8 +77,7 @@ abstract class DataLayerAppHelper( val appInstallationStatus = if (allInstalledNodes.contains(it.id)) { val nodeType = when (it.id) { in installedPhoneNodes -> AppInstallationStatusNodeType.PHONE - in installedWatchNodes -> AppInstallationStatusNodeType.WATCH - else -> AppInstallationStatusNodeType.UNKNOWN + else -> AppInstallationStatusNodeType.WATCH } AppInstallationStatus.Installed(nodeType = nodeType) } else { diff --git a/datalayer/sample/wear/src/main/java/com/google/android/horologist/datalayer/sample/screens/nodesactions/NodesActionViewModel.kt b/datalayer/sample/wear/src/main/java/com/google/android/horologist/datalayer/sample/screens/nodesactions/NodesActionViewModel.kt index 6f5669cef8..abeaba2f65 100644 --- a/datalayer/sample/wear/src/main/java/com/google/android/horologist/datalayer/sample/screens/nodesactions/NodesActionViewModel.kt +++ b/datalayer/sample/wear/src/main/java/com/google/android/horologist/datalayer/sample/screens/nodesactions/NodesActionViewModel.kt @@ -74,7 +74,6 @@ class NodesActionViewModel when (status.nodeType) { AppInstallationStatusNodeType.WATCH -> NodeTypeUiModel.WATCH AppInstallationStatusNodeType.PHONE -> NodeTypeUiModel.PHONE - AppInstallationStatusNodeType.UNKNOWN -> NodeTypeUiModel.UNKNOWN } } AppInstallationStatus.NotInstalled -> NodeTypeUiModel.UNKNOWN