Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert back to old logic for "Bluetooth playback"

Browse source
This commit is contained in:
Prathamesh More 2022-06-21 14:28:44 +05:30
parent 111546bc4c
commit ad4467af93
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
View file

@ -18,7 +18,6 @@ import android.app.NotificationManager
import android.app.PendingIntent import android.app.PendingIntent
import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetManager
import android.bluetooth.BluetoothDevice import android.bluetooth.BluetoothDevice
import android.bluetooth.BluetoothDevice.EXTRA_DEVICE
import android.content.* import android.content.*
import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.content.SharedPreferences.OnSharedPreferenceChangeListener
import android.content.pm.ServiceInfo import android.content.pm.ServiceInfo
@ -224,14 +223,15 @@ class MusicService : MediaBrowserServiceCompat(),
var shuffleMode = 0 var shuffleMode = 0
private val songPlayCountHelper = SongPlayCountHelper() private val songPlayCountHelper = SongPlayCountHelper()
private val bluetoothReceiver = object : BroadcastReceiver() { private val bluetoothReceiver: BroadcastReceiver = object : BroadcastReceiver() {
@SuppressLint("MissingPermission")
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
val action = intent.action val action = intent.action
val extra = intent.getParcelableExtra<BluetoothDevice>(EXTRA_DEVICE)!!
if (action != null) { if (action != null) {
if (BluetoothDevice.ACTION_ACL_CONNECTED == action && isBluetoothSpeaker) { if (BluetoothDevice.ACTION_ACL_CONNECTED == action && isBluetoothSpeaker) {
if (extra.type == BluetoothDevice.DEVICE_TYPE_CLASSIC) play() @Suppress("Deprecation")
if (getSystemService<AudioManager>()!!.isBluetoothA2dpOn) {
play()
}
} }
} }
} }
@ -967,6 +967,7 @@ class MusicService : MediaBrowserServiceCompat(),
intent.putExtra("position", songProgressMillis.toLong()) intent.putExtra("position", songProgressMillis.toLong())
intent.putExtra("playing", isPlaying) intent.putExtra("playing", isPlaying)
intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME) intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME)
@Suppress("Deprecation")
sendStickyBroadcast(intent) sendStickyBroadcast(intent)
} }