Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed build due to @Nullable changes in SDK API

Browse source
This commit is contained in:
Sylvain Berfini 2022-12-05 15:23:49 +01:00
parent a1d1bc035e
commit 59eb436423
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt
View file

@ -222,7 +222,7 @@ class AudioSettingsViewModel : GenericSettingsViewModel() {
if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityRecord)) { if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityRecord)) {
labels.add(audioDevice.id) labels.add(audioDevice.id)
values.add(audioDevice) values.add(audioDevice)
if (audioDevice.id == default.id) { if (audioDevice.id == default?.id) {
inputAudioDeviceIndex.value = index inputAudioDeviceIndex.value = index
} }
index += 1 index += 1
@ -242,7 +242,7 @@ class AudioSettingsViewModel : GenericSettingsViewModel() {
if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) { if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) {
labels.add(audioDevice.id) labels.add(audioDevice.id)
values.add(audioDevice) values.add(audioDevice)
if (audioDevice.id == default.id) { if (audioDevice.id == default?.id) {
outputAudioDeviceIndex.value = index outputAudioDeviceIndex.value = index
} }
index += 1 index += 1

4
app/src/main/java/org/linphone/utils/AudioRouteUtils.kt
View file

@ -46,9 +46,9 @@ class AudioRouteUtils {
else else
AudioDevice.Capabilities.CapabilityRecord AudioDevice.Capabilities.CapabilityRecord
val preferredDriver = if (output) { val preferredDriver = if (output) {
coreContext.core.defaultOutputAudioDevice.driverName coreContext.core.defaultOutputAudioDevice?.driverName
} else { } else {
coreContext.core.defaultInputAudioDevice.driverName coreContext.core.defaultInputAudioDevice?.driverName
} }
val extendedAudioDevices = coreContext.core.extendedAudioDevices val extendedAudioDevices = coreContext.core.extendedAudioDevices