Skip to content

Commit 6447dd4

Browse files
committed
Addresses comments
1 parent 86b81ba commit 6447dd4

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

app/src/main/res/values/wear.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
<string-array name="android_wear_capabilities">
1919
<item>androidify_phone</item>
2020
</string-array>
21-
</resources>
21+
</resources>

wear/common/src/main/java/com/android/developers/androidify/wear/common/WearableConstants.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ object WearableConstants {
2323
const val ANDROIDIFY_INSTALLED_PHONE = "androidify_phone"
2424
const val ANDROIDIFY_TRANSFER_PATH_TEMPLATE = "/transfer_apk/%s"
2525

26+
const val ANDROIDIFY_PLAY_URL = "market://details?id="
27+
const val ANDROIDIFY_LAUNCH_URL = "androidify://launch"
28+
2629
const val SETUP_TIMEOUT_MS = 60_000L
2730
const val TRANSFER_TIMEOUT_MS = 60_000L
2831
}

wear/src/main/java/com/android/developers/androidify/LaunchOnPhoneActivity.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import androidx.wear.remote.interactions.RemoteActivityHelper
2525
import androidx.wear.widget.ConfirmationOverlay
2626
import androidx.wear.widget.ConfirmationOverlay.OPEN_ON_PHONE_ANIMATION
2727
import com.android.developers.androidify.wear.common.WearableConstants.ANDROIDIFY_INSTALLED_PHONE
28+
import com.android.developers.androidify.wear.common.WearableConstants.ANDROIDIFY_LAUNCH_URL
29+
import com.android.developers.androidify.wear.common.WearableConstants.ANDROIDIFY_PLAY_URL
2830
import com.google.android.gms.wearable.CapabilityClient
2931
import com.google.android.gms.wearable.Wearable
3032
import kotlinx.coroutines.guava.await
@@ -75,21 +77,17 @@ class LaunchOnPhoneActivity : ComponentActivity() {
7577
CapabilityClient.FILTER_REACHABLE,
7678
)
7779
.await()
78-
return if (capabilities.nodes.isNotEmpty()) {
79-
capabilities.nodes.first().id
80-
} else {
81-
null
82-
}
80+
return capabilities.nodes.firstOrNull()?.id
8381
}
8482

8583
private fun getPlayIntent(): Intent {
86-
val intent = Intent(Intent.ACTION_VIEW, "market://details?id=$packageName".toUri())
84+
val intent = Intent(Intent.ACTION_VIEW, "$ANDROIDIFY_PLAY_URL$packageName".toUri())
8785
intent.addCategory(Intent.CATEGORY_BROWSABLE)
8886
return intent
8987
}
9088

9189
private fun getAndroidifyIntent(): Intent {
92-
val intent = Intent(Intent.ACTION_VIEW, "androidify://launch".toUri())
90+
val intent = Intent(Intent.ACTION_VIEW, ANDROIDIFY_LAUNCH_URL.toUri())
9391
intent.addCategory(Intent.CATEGORY_BROWSABLE)
9492
return intent
9593
}

0 commit comments

Comments
 (0)