From b65270d36fdd4d3a23940e489a7d76529c7d5273 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 25 Mar 2021 17:23:06 +0100 Subject: [PATCH] Removed a few TODOs in Assistant, replaced them by showing a simple error message in a SnackBar for now --- .../org/linphone/activities/SnackBarActivity.kt | 1 + .../activities/assistant/AssistantActivity.kt | 4 ++++ .../assistant/fragments/AccountLoginFragment.kt | 7 +++++++ .../fragments/EmailAccountCreationFragment.kt | 7 +++++++ .../fragments/EmailAccountValidationFragment.kt | 7 +++++++ .../fragments/GenericAccountLoginFragment.kt | 7 +++++++ .../fragments/PhoneAccountCreationFragment.kt | 7 +++++++ .../fragments/PhoneAccountLinkingFragment.kt | 7 +++++++ .../fragments/PhoneAccountValidationFragment.kt | 7 +++++++ .../viewmodels/AccountLoginViewModel.kt | 12 ++++++++---- .../viewmodels/EmailAccountCreationViewModel.kt | 12 ++++++++---- .../EmailAccountValidationViewModel.kt | 14 +++++++++----- .../viewmodels/GenericLoginViewModel.kt | 6 +++++- .../viewmodels/PhoneAccountCreationViewModel.kt | 12 ++++++++---- .../viewmodels/PhoneAccountLinkingViewModel.kt | 14 +++++++++----- .../PhoneAccountValidationViewModel.kt | 17 ++++++++++------- .../linphone/activities/main/MainActivity.kt | 4 ++++ 17 files changed, 115 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/SnackBarActivity.kt b/app/src/main/java/org/linphone/activities/SnackBarActivity.kt index 439999b58..7eb57e548 100644 --- a/app/src/main/java/org/linphone/activities/SnackBarActivity.kt +++ b/app/src/main/java/org/linphone/activities/SnackBarActivity.kt @@ -21,4 +21,5 @@ package org.linphone.activities interface SnackBarActivity { fun showSnackBar(resourceId: Int) + fun showSnackBar(message: String) } diff --git a/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt b/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt index b222e0b4c..da8259ea3 100644 --- a/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt +++ b/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt @@ -44,4 +44,8 @@ class AssistantActivity : GenericActivity(), SnackBarActivity { override fun showSnackBar(resourceId: Int) { Snackbar.make(binding.coordinator, resourceId, Snackbar.LENGTH_LONG).show() } + + override fun showSnackBar(message: String) { + Snackbar.make(binding.coordinator, message, Snackbar.LENGTH_LONG).show() + } } diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt index 5dba94e76..59a56b681 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt @@ -26,6 +26,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R +import org.linphone.activities.assistant.AssistantActivity import org.linphone.activities.assistant.viewmodels.AccountLoginViewModel import org.linphone.activities.assistant.viewmodels.AccountLoginViewModelFactory import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel @@ -110,6 +111,12 @@ class AccountLoginFragment : AbstractPhoneFragment + (requireActivity() as AssistantActivity).showSnackBar(message) + } + }) + checkPermission() } } diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountCreationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountCreationFragment.kt index 90a053247..13a4c55c9 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountCreationFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountCreationFragment.kt @@ -23,6 +23,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import org.linphone.R import org.linphone.activities.GenericFragment +import org.linphone.activities.assistant.AssistantActivity import org.linphone.activities.assistant.viewmodels.EmailAccountCreationViewModel import org.linphone.activities.assistant.viewmodels.EmailAccountCreationViewModelFactory import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel @@ -52,5 +53,11 @@ class EmailAccountCreationFragment : GenericFragment + (requireActivity() as AssistantActivity).showSnackBar(message) + } + }) } } diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountValidationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountValidationFragment.kt index 92c6abcf5..b6f3e7aa3 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountValidationFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountValidationFragment.kt @@ -23,6 +23,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import org.linphone.R import org.linphone.activities.GenericFragment +import org.linphone.activities.assistant.AssistantActivity import org.linphone.activities.assistant.viewmodels.* import org.linphone.activities.main.navigateToAccountLinking import org.linphone.databinding.AssistantEmailAccountValidationFragmentBinding @@ -54,5 +55,11 @@ class EmailAccountValidationFragment : GenericFragment + (requireActivity() as AssistantActivity).showSnackBar(message) + } + }) } } diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountLoginFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountLoginFragment.kt index 5c5bbfb57..812141e6d 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountLoginFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountLoginFragment.kt @@ -25,6 +25,7 @@ import androidx.lifecycle.ViewModelProvider import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R import org.linphone.activities.GenericFragment +import org.linphone.activities.assistant.AssistantActivity import org.linphone.activities.assistant.viewmodels.GenericLoginViewModel import org.linphone.activities.assistant.viewmodels.GenericLoginViewModelFactory import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel @@ -79,5 +80,11 @@ class GenericAccountLoginFragment : GenericFragment + (requireActivity() as AssistantActivity).showSnackBar(message) + } + }) } } diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt index a0742b22d..eb32f3e79 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt @@ -22,6 +22,7 @@ package org.linphone.activities.assistant.fragments import android.os.Bundle import androidx.lifecycle.ViewModelProvider import org.linphone.R +import org.linphone.activities.assistant.AssistantActivity import org.linphone.activities.assistant.viewmodels.PhoneAccountCreationViewModel import org.linphone.activities.assistant.viewmodels.PhoneAccountCreationViewModelFactory import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel @@ -63,6 +64,12 @@ class PhoneAccountCreationFragment : AbstractPhoneFragment + (requireActivity() as AssistantActivity).showSnackBar(message) + } + }) + checkPermission() } } diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt index 9fc8b255a..4c4a8ccf3 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt @@ -23,6 +23,7 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import org.linphone.LinphoneApplication import org.linphone.R +import org.linphone.activities.assistant.AssistantActivity import org.linphone.activities.assistant.viewmodels.* import org.linphone.activities.main.navigateToEchoCancellerCalibration import org.linphone.activities.main.navigateToPhoneAccountValidation @@ -88,6 +89,12 @@ class PhoneAccountLinkingFragment : AbstractPhoneFragment + (requireActivity() as AssistantActivity).showSnackBar(message) + } + }) + checkPermission() } } diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountValidationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountValidationFragment.kt index d72bdbf53..862592e29 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountValidationFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountValidationFragment.kt @@ -26,6 +26,7 @@ import androidx.lifecycle.ViewModelProvider import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R import org.linphone.activities.GenericFragment +import org.linphone.activities.assistant.AssistantActivity import org.linphone.activities.assistant.viewmodels.PhoneAccountValidationViewModel import org.linphone.activities.assistant.viewmodels.PhoneAccountValidationViewModelFactory import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel @@ -75,6 +76,12 @@ class PhoneAccountValidationFragment : GenericFragment + (requireActivity() as AssistantActivity).showSnackBar(message) + } + }) + val clipboard = requireContext().getSystemService(CLIPBOARD_SERVICE) as ClipboardManager clipboard.addPrimaryClipChangedListener { val data = clipboard.primaryClip diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt index 856f10d54..d8a20c7c1 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt @@ -60,6 +60,10 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM MutableLiveData>() } + val onErrorEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + private val listener = object : AccountCreatorListenerStub() { override fun onRecoverAccount( creator: AccountCreator, @@ -72,7 +76,7 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM if (status == AccountCreator.Status.RequestOk) { goToSmsValidationEvent.value = Event(true) } else { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -167,7 +171,7 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM if (!createProxyConfig()) { waitForServerAnswer.value = false coreContext.core.removeListener(coreListener) - // TODO: show error + onErrorEvent.value = Event("Error: Failed to create account object") } } else { val result = AccountCreator.PhoneNumberStatus.fromInt(accountCreator.setPhoneNumber(phoneNumber.value, prefix.value)) @@ -191,7 +195,7 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM Log.i("[Assistant] [Account Login] Recover account returned $status") if (status != AccountCreator.Status.RequestOk) { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -210,7 +214,7 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM if (proxyConfig == null) { Log.e("[Assistant] [Account Login] Account creator couldn't create proxy config") - // TODO: show error + onErrorEvent.value = Event("Error: Failed to create account object") return false } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt index b600419da..0d2734263 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt @@ -58,6 +58,10 @@ class EmailAccountCreationViewModel(val accountCreator: AccountCreator) : ViewMo val goToEmailValidationEvent = MutableLiveData>() + val onErrorEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + private val listener = object : AccountCreatorListenerStub() { override fun onIsAccountExist( creator: AccountCreator, @@ -74,12 +78,12 @@ class EmailAccountCreationViewModel(val accountCreator: AccountCreator) : ViewMo val createAccountStatus = creator.createAccount() if (createAccountStatus != AccountCreator.Status.RequestOk) { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } else -> { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -97,7 +101,7 @@ class EmailAccountCreationViewModel(val accountCreator: AccountCreator) : ViewMo goToEmailValidationEvent.value = Event(true) } else -> { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -148,7 +152,7 @@ class EmailAccountCreationViewModel(val accountCreator: AccountCreator) : ViewMo Log.i("[Assistant] [Account Creation] Account exists returned $status") if (status != AccountCreator.Status.RequestOk) { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt index e68b576a4..273120f44 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt @@ -44,6 +44,10 @@ class EmailAccountValidationViewModel(val accountCreator: AccountCreator) : View val leaveAssistantEvent = MutableLiveData>() + val onErrorEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + private val listener = object : AccountCreatorListenerStub() { override fun onIsAccountActivated( creator: AccountCreator, @@ -58,14 +62,14 @@ class EmailAccountValidationViewModel(val accountCreator: AccountCreator) : View if (createProxyConfig()) { leaveAssistantEvent.value = Event(true) } else { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } AccountCreator.Status.AccountNotActivated -> { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } else -> { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -87,7 +91,7 @@ class EmailAccountValidationViewModel(val accountCreator: AccountCreator) : View Log.i("[Assistant] [Account Validation] Account exists returned $status") if (status != AccountCreator.Status.RequestOk) { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } @@ -96,7 +100,7 @@ class EmailAccountValidationViewModel(val accountCreator: AccountCreator) : View if (proxyConfig == null) { Log.e("[Assistant] [Account Validation] Account creator couldn't create proxy config") - // TODO: show error + onErrorEvent.value = Event("Error: Failed to create account object") return false } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt index 2fc3386ad..494aab5d4 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt @@ -59,6 +59,10 @@ class GenericLoginViewModel(private val accountCreator: AccountCreator) : ViewMo MutableLiveData>() } + val onErrorEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + private var proxyConfigToCheck: ProxyConfig? = null private val coreListener = object : CoreListenerStub() { @@ -130,7 +134,7 @@ class GenericLoginViewModel(private val accountCreator: AccountCreator) : ViewMo if (proxyConfig == null) { Log.e("[Assistant] [Generic Login] Account creator couldn't create proxy config") coreContext.core.removeListener(coreListener) - // TODO: show error + onErrorEvent.value = Event("Error: Failed to create account object") return } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt index dd5ef893a..dc2eb1273 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt @@ -54,6 +54,10 @@ class PhoneAccountCreationViewModel(accountCreator: AccountCreator) : AbstractPh MutableLiveData>() } + val onErrorEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + private val listener = object : AccountCreatorListenerStub() { override fun onIsAccountExist( creator: AccountCreator, @@ -75,12 +79,12 @@ class PhoneAccountCreationViewModel(accountCreator: AccountCreator) : AbstractPh Log.i("[Phone Account Creation] createAccount returned $createAccountStatus") if (createAccountStatus != AccountCreator.Status.RequestOk) { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } else -> { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -100,7 +104,7 @@ class PhoneAccountCreationViewModel(accountCreator: AccountCreator) : AbstractPh phoneNumberError.value = AppUtils.getString(R.string.assistant_error_phone_number_already_exists) } else -> { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -149,7 +153,7 @@ class PhoneAccountCreationViewModel(accountCreator: AccountCreator) : AbstractPh Log.i("[Phone Account Creation] isAccountExist returned $status") if (status != AccountCreator.Status.RequestOk) { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt index 788c61622..da93c4c7d 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt @@ -48,6 +48,10 @@ class PhoneAccountLinkingViewModel(accountCreator: AccountCreator) : AbstractPho val goToSmsValidationEvent = MutableLiveData>() + val onErrorEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + private val listener = object : AccountCreatorListenerStub() { override fun onIsAliasUsed( creator: AccountCreator, @@ -61,16 +65,16 @@ class PhoneAccountLinkingViewModel(accountCreator: AccountCreator) : AbstractPho if (creator.linkAccount() != AccountCreator.Status.RequestOk) { Log.e("[Phone Account Linking] linkAccount status is $status") waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } AccountCreator.Status.AliasExist, AccountCreator.Status.AliasIsAccount -> { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } else -> { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -88,7 +92,7 @@ class PhoneAccountLinkingViewModel(accountCreator: AccountCreator) : AbstractPho goToSmsValidationEvent.value = Event(true) } else -> { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -124,7 +128,7 @@ class PhoneAccountLinkingViewModel(accountCreator: AccountCreator) : AbstractPho Log.i("[Phone Account Linking] isAliasUsed returned $status") if (status != AccountCreator.Status.RequestOk) { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt index ec2e7e2f0..f8818d561 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt @@ -52,6 +52,10 @@ class PhoneAccountValidationViewModel(val accountCreator: AccountCreator) : View val leaveAssistantEvent = MutableLiveData>() + val onErrorEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + val listener = object : AccountCreatorListenerStub() { override fun onLoginLinphoneAccount( creator: AccountCreator, @@ -65,10 +69,10 @@ class PhoneAccountValidationViewModel(val accountCreator: AccountCreator) : View if (createProxyConfig()) { leaveAssistantEvent.value = Event(true) } else { - // TODO: show error + onErrorEvent.value = Event("Error: Failed to create account object") } } else { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } @@ -85,7 +89,7 @@ class PhoneAccountValidationViewModel(val accountCreator: AccountCreator) : View leaveAssistantEvent.value = Event(true) } else -> { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -102,10 +106,10 @@ class PhoneAccountValidationViewModel(val accountCreator: AccountCreator) : View if (createProxyConfig()) { leaveAssistantEvent.value = Event(true) } else { - // TODO: show error + onErrorEvent.value = Event("Error: Failed to create account object") } } else { - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } } @@ -133,7 +137,7 @@ class PhoneAccountValidationViewModel(val accountCreator: AccountCreator) : View Log.i("[Assistant] [Phone Account Validation] Code validation result is $status") if (status != AccountCreator.Status.RequestOk) { waitForServerAnswer.value = false - // TODO: show error + onErrorEvent.value = Event("Error: ${status.name}") } } @@ -142,7 +146,6 @@ class PhoneAccountValidationViewModel(val accountCreator: AccountCreator) : View if (proxyConfig == null) { Log.e("[Assistant] [Phone Account Validation] Account creator couldn't create proxy config") - // TODO: show error return false } diff --git a/app/src/main/java/org/linphone/activities/main/MainActivity.kt b/app/src/main/java/org/linphone/activities/main/MainActivity.kt index adb72751c..54ff2bd73 100644 --- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt +++ b/app/src/main/java/org/linphone/activities/main/MainActivity.kt @@ -132,6 +132,10 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin Snackbar.make(findViewById(R.id.coordinator), resourceId, Snackbar.LENGTH_LONG).show() } + override fun showSnackBar(message: String) { + Snackbar.make(findViewById(R.id.coordinator), message, Snackbar.LENGTH_LONG).show() + } + override fun onPostCreate(savedInstanceState: Bundle?) { super.onPostCreate(savedInstanceState) findNavController(R.id.nav_host_fragment).addOnDestinationChangedListener(this)