mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-05-15 18:26:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove CompanionDeviceManagerCompat extension

Browse Source
This commit is contained in:
andrekir
2023-06-18 17:39:04 -03:00
parent 07c847ea68
commit 379da332e1
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View File

@@ -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)) }
}

9
app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt
View File

@@ -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)