From 4fb04e9ed540126aa6bc1e8d0bdfd842a552ea6f Mon Sep 17 00:00:00 2001 From: Andres Aguilar Date: Fri, 21 Aug 2020 15:21:35 -0700 Subject: [PATCH] Using when construct --- .../jellyfin/mobile/RemotePlayerService.kt | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/org/jellyfin/mobile/RemotePlayerService.kt b/app/src/main/java/org/jellyfin/mobile/RemotePlayerService.kt index 5b04ce7e..30eca6e2 100644 --- a/app/src/main/java/org/jellyfin/mobile/RemotePlayerService.kt +++ b/app/src/main/java/org/jellyfin/mobile/RemotePlayerService.kt @@ -81,27 +81,31 @@ class RemotePlayerService : Service(), CoroutineScope { private var headphoneFlag = false private val receiver: BroadcastReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { - if (intent.action == AudioManager.ACTION_HEADSET_PLUG) { - val state = intent.getIntExtra("state", 2) - if (state == 0) { - binder.sendInputManagerCommand(INPUT_MANAGER_COMMAND_PLAY_PAUSE) - headphoneFlag = true - } else if (headphoneFlag) { - binder.sendInputManagerCommand(INPUT_MANAGER_COMMAND_PLAY_PAUSE) + when (intent.action ) { + AudioManager.ACTION_HEADSET_PLUG -> { + val state = intent.getIntExtra("state", 2) + if (state == 0) { + binder.sendInputManagerCommand(INPUT_MANAGER_COMMAND_PLAY_PAUSE) + headphoneFlag = true + } else if (headphoneFlag) { + binder.sendInputManagerCommand(INPUT_MANAGER_COMMAND_PLAY_PAUSE) + } } - } else if (intent.action == BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED) { - val extras = intent.extras ?: return - val state = extras.getInt(BluetoothA2dp.EXTRA_STATE) - val previousState = extras.getInt(BluetoothA2dp.EXTRA_PREVIOUS_STATE) - if ((state == BluetoothA2dp.STATE_DISCONNECTED || state == BluetoothA2dp.STATE_DISCONNECTING) && previousState == BluetoothA2dp.STATE_CONNECTED) { - binder.sendInputManagerCommand(INPUT_MANAGER_COMMAND_PAUSE) + BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED -> { + val extras = intent.extras ?: return + val state = extras.getInt(BluetoothA2dp.EXTRA_STATE) + val previousState = extras.getInt(BluetoothA2dp.EXTRA_PREVIOUS_STATE) + if ((state == BluetoothA2dp.STATE_DISCONNECTED || state == BluetoothA2dp.STATE_DISCONNECTING) && previousState == BluetoothA2dp.STATE_CONNECTED) { + binder.sendInputManagerCommand(INPUT_MANAGER_COMMAND_PAUSE) + } } - } else if (intent.action == BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED) { - val extras = intent.extras ?: return - val state = extras.getInt(BluetoothHeadset.EXTRA_STATE) - val previousState = extras.getInt(BluetoothHeadset.EXTRA_PREVIOUS_STATE) - if (state == BluetoothHeadset.STATE_AUDIO_DISCONNECTED && previousState == BluetoothHeadset.STATE_AUDIO_CONNECTED) { - binder.sendInputManagerCommand(INPUT_MANAGER_COMMAND_PAUSE) + BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED -> { + val extras = intent.extras ?: return + val state = extras.getInt(BluetoothHeadset.EXTRA_STATE) + val previousState = extras.getInt(BluetoothHeadset.EXTRA_PREVIOUS_STATE) + if (state == BluetoothHeadset.STATE_AUDIO_DISCONNECTED && previousState == BluetoothHeadset.STATE_AUDIO_CONNECTED) { + binder.sendInputManagerCommand(INPUT_MANAGER_COMMAND_PAUSE) + } } } }