minor refactor

This commit is contained in:
Ryan Zhao 2023-04-24 15:50:53 +10:00
parent 51856138e3
commit c7bbdb778b
2 changed files with 7 additions and 7 deletions

View File

@ -15,7 +15,7 @@ class SignalAudioHandler(looper: Looper) : Handler(looper) {
}
}
fun isOnHandler(): Boolean {
private fun isOnHandler(): Boolean {
return Looper.myLooper() == looper
}
}

View File

@ -34,9 +34,9 @@ class SignalAudioManager(private val context: Context,
private val androidAudioManager: AudioManagerCompat) {
private var commandAndControlThread: HandlerThread? = HandlerThread("call-audio", ThreadUtils.PRIORITY_IMPORTANT_BACKGROUND_THREAD).apply { start() }
private var handler: SignalAudioHandler? = SignalAudioHandler(commandAndControlThread!!.looper)
private var handler: SignalAudioHandler = SignalAudioHandler(commandAndControlThread!!.looper)
private var signalBluetoothManager: SignalBluetoothManager = SignalBluetoothManager(context, this, androidAudioManager, handler!!)
private var signalBluetoothManager: SignalBluetoothManager = SignalBluetoothManager(context, this, androidAudioManager, handler)
private var state: State = State.UNINITIALIZED
@ -63,7 +63,7 @@ class SignalAudioManager(private val context: Context,
private var wiredHeadsetReceiver: WiredHeadsetReceiver? = null
fun handleCommand(command: AudioManagerCommand) {
handler?.post {
handler.post {
when (command) {
is AudioManagerCommand.Initialize -> initialize()
is AudioManagerCommand.UpdateAudioDeviceState -> updateAudioDeviceState()
@ -107,7 +107,7 @@ class SignalAudioManager(private val context: Context,
}
fun shutdown() {
handler!!.post {
handler.post {
stop(false)
if (commandAndControlThread != null) {
Log.i(TAG, "Shutting down command and control")
@ -172,7 +172,7 @@ class SignalAudioManager(private val context: Context,
}
private fun updateAudioDeviceState() {
handler!!.assertHandlerThread()
handler.assertHandlerThread()
Log.i(
TAG,
@ -362,7 +362,7 @@ class SignalAudioManager(private val context: Context,
val pluggedIn = intent.getIntExtra("state", 0) == 1
val hasMic = intent.getIntExtra("microphone", 0) == 1
handler?.post { onWiredHeadsetChange(pluggedIn, hasMic) }
handler.post { onWiredHeadsetChange(pluggedIn, hasMic) }
}
}