From ce6644dbee58dcbe5fbbe219bdaf72a5149d6718 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 25 Feb 2021 10:03:54 +0100 Subject: [PATCH] Fixed gitlab release build --- .../activities/assistant/viewmodels/AbstractPhoneViewModel.kt | 3 ++- .../main/contact/viewmodels/ContactEditorViewModel.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt index c9a3b48de..4141b7a4f 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt @@ -59,9 +59,10 @@ abstract class AbstractPhoneViewModel(val accountCreator: AccountCreator) : View Log.i("[Assistant] Found prefix from dial plan: ${dialPlan.countryCallingCode}") prefix.value = "+${dialPlan.countryCallingCode}" } + if (number != null) { Log.i("[Assistant] Found phone number: $number") - phoneNumber.value = number + phoneNumber.value = number!! } } diff --git a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt index f171d2993..6d949e332 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt @@ -68,7 +68,7 @@ class ContactEditorViewModel(val c: Contact?) : ViewModel(), ContactViewModelInt var syncAccountType: String? = null init { - contact.value = c + if (c != null) contact.value = c!! firstName.value = c?.firstName ?: "" lastName.value = c?.lastName ?: "" organization.value = c?.organization ?: ""