From ad4467af93fa489d57e59d2cab3c42da71ef8d44 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Tue, 21 Jun 2022 14:28:44 +0530 Subject: [PATCH] Revert back to old logic for "Bluetooth playback" --- .../name/monkey/retromusic/service/MusicService.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt index 26d1fe7a9..994b824f1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt @@ -18,7 +18,6 @@ import android.app.NotificationManager import android.app.PendingIntent import android.appwidget.AppWidgetManager import android.bluetooth.BluetoothDevice -import android.bluetooth.BluetoothDevice.EXTRA_DEVICE import android.content.* import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.content.pm.ServiceInfo @@ -224,14 +223,15 @@ class MusicService : MediaBrowserServiceCompat(), var shuffleMode = 0 private val songPlayCountHelper = SongPlayCountHelper() - private val bluetoothReceiver = object : BroadcastReceiver() { - @SuppressLint("MissingPermission") + private val bluetoothReceiver: BroadcastReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { val action = intent.action - val extra = intent.getParcelableExtra(EXTRA_DEVICE)!! if (action != null) { if (BluetoothDevice.ACTION_ACL_CONNECTED == action && isBluetoothSpeaker) { - if (extra.type == BluetoothDevice.DEVICE_TYPE_CLASSIC) play() + @Suppress("Deprecation") + if (getSystemService()!!.isBluetoothA2dpOn) { + play() + } } } } @@ -967,6 +967,7 @@ class MusicService : MediaBrowserServiceCompat(), intent.putExtra("position", songProgressMillis.toLong()) intent.putExtra("playing", isPlaying) intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME) + @Suppress("Deprecation") sendStickyBroadcast(intent) }