Replace deprecated bluetooth calls

home-assistant · Jan 17, 2022 · 6c07f87 · 6c07f87
1 parent 0b3f337
commit 6c07f87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/full/java/io/homeassistant/companion/android/notifications/MessagingService.kt b/app/src/full/java/io/homeassistant/companion/android/notifications/MessagingService.kt
@@ -5,10 +5,8 @@ import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
-import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothManager
 import android.content.ComponentName
-import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -72,7 +70,6 @@ import java.net.URL
 import java.net.URLDecoder
 import java.util.Locale
 import javax.inject.Inject
-import kotlin.collections.HashMap
 import io.homeassistant.companion.android.common.R as commonR
 
 @AndroidEntryPoint

diff --git a/app/src/main/java/io/homeassistant/companion/android/bluetooth/ble/TransmitterManager.kt b/app/src/main/java/io/homeassistant/companion/android/bluetooth/ble/TransmitterManager.kt
@@ -1,9 +1,11 @@
 package io.homeassistant.companion.android.bluetooth.ble
 
 import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothManager
 import android.bluetooth.le.AdvertiseCallback
 import android.bluetooth.le.AdvertiseSettings
 import android.content.Context
+import androidx.core.content.getSystemService
 import org.altbeacon.beacon.Beacon
 import org.altbeacon.beacon.BeaconParser
 import org.altbeacon.beacon.BeaconTransmitter
@@ -53,7 +55,8 @@ object TransmitterManager {
             val parser = BeaconParser().setBeaconLayout(haTransmitter.beaconLayout)
             physicalTransmitter = BeaconTransmitter(context, parser)
         }
-        val bluetoothOn = BluetoothAdapter.getDefaultAdapter().isEnabled
+        val bluetoothAdapter = context.getSystemService<BluetoothManager>()?.adapter
+        val bluetoothOn = bluetoothAdapter?.isEnabled == true
         if (bluetoothOn) {
             val beacon = buildBeacon(haTransmitter)
             if (!physicalTransmitter.isStarted) {