From 379da332e1fd04b328703e7a2e2dc3580aed87d8 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Sun, 18 Jun 2023 17:39:04 -0300
Subject: [PATCH] fix: remove CompanionDeviceManagerCompat extension

---
 .../main/java/com/geeksville/mesh/ui/SettingsFragment.kt | 4 ++--
 .../java/com/geeksville/mesh/util/CompatExtensions.kt    | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 9d438cf8b..24291bf24 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -3,6 +3,7 @@ package com.geeksville.mesh.ui
 import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.bluetooth.BluetoothDevice
+import android.companion.CompanionDeviceManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -47,7 +48,6 @@ import com.geeksville.mesh.repository.radio.MockInterface
 import com.geeksville.mesh.repository.usb.UsbRepository
 import com.geeksville.mesh.service.MeshService
 import com.geeksville.mesh.service.SoftwareUpdateService
-import com.geeksville.mesh.util.CompanionDeviceManagerCompat
 import com.geeksville.mesh.util.PendingIntentCompat
 import com.geeksville.mesh.util.anonymize
 import com.geeksville.mesh.util.exceptionReporter
@@ -247,7 +247,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
             ActivityResultContracts.StartIntentSenderForResult()
         ) {
             it.data
-                ?.getParcelableExtraCompat<BluetoothDevice>(CompanionDeviceManagerCompat.EXTRA_DEVICE)
+                ?.getParcelableExtraCompat<BluetoothDevice>(CompanionDeviceManager.EXTRA_DEVICE)
                 ?.let { device -> onSelected(BTScanModel.BLEDeviceListEntry(device)) }
         }
 
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 00d1f0f8b..53046dfc2 100644
--- a/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt
@@ -25,15 +25,6 @@ object PendingIntentCompat {
     }
 }
 
-object CompanionDeviceManagerCompat {
-    @SuppressLint("InlinedApi")
-    val EXTRA_DEVICE = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-        CompanionDeviceManager.EXTRA_ASSOCIATION
-    } else {
-        @Suppress("DEPRECATION") CompanionDeviceManager.EXTRA_DEVICE
-    }
-}
-
 inline fun <reified T : Parcelable> Parcel.readParcelableCompat(loader: ClassLoader?): T? =
     ParcelCompat.readParcelable(this, loader, T::class.java)