Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 18:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nullability safety for getCommunicationDevice().

Browse Source
This commit is contained in:
Nicholas
2022-10-03 10:50:55 -04:00
committed by GitHub
parent 04822bacdc
commit 6c56ef470f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java
View File

@@ -103,6 +103,7 @@ public abstract class AudioManagerCompat {
}
@RequiresApi(31)
@Nullable
public AudioDeviceInfo getCommunicationDevice() {
return audioManager.getCommunicationDevice();
}

7
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt
View File

@@ -166,7 +166,12 @@ class FullSignalAudioManagerApi31(context: Context, eventListener: EventListener
private fun updateAudioDeviceState() {
handler.assertHandlerThread()
currentAudioDevice = AudioDeviceMapping.fromPlatformType(androidAudioManager.communicationDevice.type)
val communicationDevice: AudioDeviceInfo? = androidAudioManager.communicationDevice
currentAudioDevice = if (communicationDevice == null) {
AudioDevice.NONE
} else {
AudioDeviceMapping.fromPlatformType(communicationDevice.type)
}
val availableCommunicationDevices: List<AudioDeviceInfo> = androidAudioManager.availableCommunicationDevices
hasBluetoothHeadset = availableCommunicationDevices.any { AudioDeviceMapping.fromPlatformType(it.type) == AudioDevice.BLUETOOTH }
hasWiredHeadset = availableCommunicationDevices.any { AudioDeviceMapping.fromPlatformType(it.type) == AudioDevice.WIRED_HEADSET }