mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 03:18:06 +00:00
Fixed crash when default device URI is null
This commit is contained in:
parent
ae775b5195
commit
5b5d6c4abb
1 changed files with 13 additions and 6 deletions
|
|
@ -90,7 +90,7 @@ class SettingsViewModel
|
|||
|
||||
val autoRecordCalls = MutableLiveData<Boolean>()
|
||||
|
||||
val goToIncomingCallNotificationChannelSettingsEvent = MutableLiveData<Event<Uri>>()
|
||||
val goToIncomingCallNotificationChannelSettingsEvent = MutableLiveData<Event<Uri?>>()
|
||||
|
||||
// Conversations settings
|
||||
val showConversationsSettings = MutableLiveData<Boolean>()
|
||||
|
|
@ -462,11 +462,18 @@ class SettingsViewModel
|
|||
@UiThread
|
||||
fun changeRingtone() {
|
||||
coreContext.postOnCoreThread { core ->
|
||||
val defaultDeviceRingtone = RingtoneManager.getActualDefaultRingtoneUri(coreContext.context, RingtoneManager.TYPE_RINGTONE)
|
||||
val coreRingtone = core.ring?.toUri()
|
||||
Log.i("$TAG Currently set ringtone in Core is [$coreRingtone], device default ringtone is [$defaultDeviceRingtone]")
|
||||
val currentRingtone = coreRingtone ?: defaultDeviceRingtone
|
||||
goToIncomingCallNotificationChannelSettingsEvent.postValue(Event(currentRingtone))
|
||||
try {
|
||||
val defaultDeviceRingtone = RingtoneManager.getActualDefaultRingtoneUri(
|
||||
coreContext.context,
|
||||
RingtoneManager.TYPE_RINGTONE
|
||||
)
|
||||
val coreRingtone = core.ring?.toUri()
|
||||
Log.i("$TAG Currently set ringtone in Core is [$coreRingtone], device default ringtone is [$defaultDeviceRingtone]")
|
||||
val currentRingtone = coreRingtone ?: defaultDeviceRingtone
|
||||
goToIncomingCallNotificationChannelSettingsEvent.postValue(Event(currentRingtone))
|
||||
} catch (e: Exception) {
|
||||
Log.e("$TAG Failed to get current ringtone: $e")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue