diff --git a/.gitignore b/.gitignore index 358094700..db3afa4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +.idea/deploymentTargetDropDown.xml .DS_Store /build /captures diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 7c4320438..000000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt index a0db119c2..35a2db940 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt @@ -138,6 +138,7 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel() { response: String? ) { Log.i("$TAG onCreateAccount status [$status] ($response)") + accountCreator.token = null operationInProgress.postValue(false) when (status) { @@ -254,13 +255,13 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel() { fun confirmPhoneNumber() { coreContext.postOnCoreThread { if (::accountCreator.isInitialized) { - val prefix = internationalPrefix.value.orEmpty() + val prefix = internationalPrefix.value.orEmpty().trim() val digitsPrefix = if (prefix.startsWith("+")) { prefix.substring(1) } else { prefix } - val number = phoneNumber.value.orEmpty() + val number = phoneNumber.value.orEmpty().trim() accountCreator.setPhoneNumber(number, digitsPrefix) val normalizedPhoneNumber = accountCreator.phoneNumber @@ -316,7 +317,7 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel() { @WorkerThread private fun checkUsername() { usernameError.postValue("") - accountCreator.username = username.value.orEmpty() + accountCreator.username = username.value.orEmpty().trim() operationInProgress.postValue(true) val status = accountCreator.isAccountExist @@ -342,7 +343,7 @@ class AccountCreationViewModel @UiThread constructor() : ViewModel() { @WorkerThread private fun createAccount() { operationInProgress.postValue(true) - accountCreator.password = password.value.orEmpty() + accountCreator.password = password.value.orEmpty().trim() val status = accountCreator.createAccount() Log.i("$TAG createAccount returned $status") diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt index bed1b2a4e..7cc023045 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt @@ -113,13 +113,13 @@ class AccountLoginViewModel @UiThread constructor() : ViewModel() { coreContext.postOnCoreThread { core -> core.loadConfigFromXml(corePreferences.linphoneDefaultValuesPath) - val user = username.value.orEmpty() + val user = username.value.orEmpty().trim() val domain = corePreferences.defaultDomain newlyCreatedAuthInfo = Factory.instance().createAuthInfo( user, null, - password.value.orEmpty(), + password.value.orEmpty().trim(), null, null, domain @@ -130,7 +130,7 @@ class AccountLoginViewModel @UiThread constructor() : ViewModel() { val identityAddress = Factory.instance().createAddress("sip:$user@$domain") accountParams.identityAddress = identityAddress - val prefix = internationalPrefix.value.orEmpty() + val prefix = internationalPrefix.value.orEmpty().trim() if (prefix.isNotEmpty()) { val prefixDigits = if (prefix.startsWith("+")) { prefix.substring(1) diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt index 92957a6bc..a5fb793af 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt @@ -128,13 +128,13 @@ class ThirdPartySipAccountLoginViewModel @UiThread constructor() : ViewModel() { coreContext.postOnCoreThread { core -> core.loadConfigFromXml(corePreferences.thirdPartyDefaultValuesPath) - val user = username.value.orEmpty() - val domainValue = domain.value.orEmpty() + val user = username.value.orEmpty().trim() + val domainValue = domain.value.orEmpty().trim() newlyCreatedAuthInfo = Factory.instance().createAuthInfo( user, null, - password.value.orEmpty(), + password.value.orEmpty().trim(), null, null, domainValue @@ -145,19 +145,19 @@ class ThirdPartySipAccountLoginViewModel @UiThread constructor() : ViewModel() { val identityAddress = Factory.instance().createAddress("sip:$user@$domainValue") if (displayName.value.orEmpty().isNotEmpty()) { - identityAddress?.displayName = displayName.value.orEmpty() + identityAddress?.displayName = displayName.value.orEmpty().trim() } accountParams.identityAddress = identityAddress val serverAddress = Factory.instance().createAddress("sip:$domainValue") - serverAddress?.transport = when (transport.value.orEmpty()) { + serverAddress?.transport = when (transport.value.orEmpty().trim()) { TCP -> TransportType.Tcp TLS -> TransportType.Tls else -> TransportType.Udp } accountParams.serverAddress = serverAddress - val prefix = internationalPrefix.value.orEmpty() + val prefix = internationalPrefix.value.orEmpty().trim() if (prefix.isNotEmpty()) { val prefixDigits = if (prefix.startsWith("+")) { prefix.substring(1) diff --git a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt index 4e51b3b90..ed2ab7d17 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt @@ -198,7 +198,7 @@ class CallsListFragment : GenericFragment() { } listViewModel.searchFilter.observe(viewLifecycleOwner) { filter -> - listViewModel.applyFilter(filter) + listViewModel.applyFilter(filter.trim()) } listViewModel.focusSearchBarEvent.observe(viewLifecycleOwner) { diff --git a/app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt b/app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt index b5657c4dd..88d799e29 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt @@ -147,8 +147,9 @@ class StartCallFragment : GenericFragment() { } viewModel.searchFilter.observe(viewLifecycleOwner) { filter -> - contactsListViewModel.applyFilter(filter) - viewModel.applyFilter(filter) + val trimmed = filter.trim() + contactsListViewModel.applyFilter(trimmed) + viewModel.applyFilter(trimmed) } viewModel.appendDigitToSearchBarEvent.observe(viewLifecycleOwner) { diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt index 24a049fb1..97c3ab0bf 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt @@ -157,7 +157,7 @@ class ContactsListFragment : GenericFragment() { } listViewModel.searchFilter.observe(viewLifecycleOwner) { filter -> - listViewModel.applyFilter(filter) + listViewModel.applyFilter(filter.trim()) } listViewModel.focusSearchBarEvent.observe(viewLifecycleOwner) { diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt index 7de9e9793..9be138901 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt @@ -133,14 +133,16 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() { // Disable peer to peer short term presence friend.incSubscribePolicy = SubscribePolicy.SPDeny } - friend.name = "${firstName.value.orEmpty().trim()} ${lastName.value.orEmpty().trim()}" + val fn = firstName.value.orEmpty().trim() + val ln = lastName.value.orEmpty().trim() + friend.name = "$fn $ln" friend.edit() val vCard = friend.vcard if (vCard != null) { - vCard.familyName = lastName.value - vCard.givenName = firstName.value + vCard.familyName = fn + vCard.givenName = ln val picture = picturePath.value.orEmpty() if (picture.isNotEmpty()) { @@ -155,9 +157,9 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() { friend.removeAddress(address) } for (address in sipAddresses) { - val data = address.value.value - if (!data.isNullOrEmpty()) { - val parsedAddress = core.interpretUrl(data.trim(), true) + val data = address.value.value.orEmpty().trim() + if (data.isNotEmpty()) { + val parsedAddress = core.interpretUrl(data, true) if (parsedAddress != null) { friend.addAddress(parsedAddress) } @@ -168,9 +170,9 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() { friend.removePhoneNumber(number) } for (number in phoneNumbers) { - val data = number.value.value - if (!data.isNullOrEmpty()) { - friend.addPhoneNumber(data.trim()) + val data = number.value.value.orEmpty().trim() + if (data.isNotEmpty()) { + friend.addPhoneNumber(data) } } diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt index 559d96298..71d692c91 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt @@ -55,8 +55,8 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() { copy.internationalPrefix = internationalPrefix.value.orEmpty() - val newPictureUri = picturePath.value - if (!newPictureUri.isNullOrEmpty() && newPictureUri != params.pictureUri) { + val newPictureUri = picturePath.value.orEmpty().trim() + if (newPictureUri.isNotEmpty() && newPictureUri != params.pictureUri) { Log.i("$TAG New account profile picture [$newPictureUri]") copy.pictureUri = newPictureUri }