From ac63e72233564de4d77b4b881dfc57eb1ef4fbf3 Mon Sep 17 00:00:00 2001 From: andrekir Date: Mon, 4 Dec 2023 21:11:18 -0300 Subject: [PATCH] fix: `CompanionDeviceManager.EXTRA_DEVICE` return types --- .../java/com/geeksville/mesh/util/CompatExtensions.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt b/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt index a05b78426..c05848490 100644 --- a/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt +++ b/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt @@ -2,6 +2,7 @@ package com.geeksville.mesh.util import android.app.PendingIntent import android.bluetooth.BluetoothDevice +import android.bluetooth.le.ScanResult import android.companion.AssociationInfo import android.companion.CompanionDeviceManager import android.content.Intent @@ -46,8 +47,11 @@ fun Intent.getAssociationResult(): String? = when { android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O -> @Suppress("DEPRECATION") - getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE) - ?.address + when (val it = getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE)) { + is BluetoothDevice -> it.address + is ScanResult -> it.device.address + else -> null + } else -> null }