From f068b5c9cec5a4fa0ebf4ae352fec4898d55a925 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 16 Dec 2024 10:03:45 +0100 Subject: [PATCH] Prevent crash if identity address couldn't be parsed --- .../viewmodel/ThirdPartySipAccountLoginViewModel.kt | 12 ++++++++++++ .../main/java/org/linphone/utils/PhoneNumberUtils.kt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) 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 d20daf652..53ef1a3bc 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 @@ -192,6 +192,18 @@ class ThirdPartySipAccountLoginViewModel } } val identityAddress = Factory.instance().createAddress(identity) + if (identityAddress == null) { + Log.e("$TAG Can't parse [$identity] as Address!") + showRedToastEvent.postValue( + Event( + Pair( + R.string.assistant_login_cant_parse_address_toast, + R.drawable.warning_circle + ) + ) + ) + return@postOnCoreThread + } newlyCreatedAuthInfo = Factory.instance().createAuthInfo( user, diff --git a/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt b/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt index c1461dad5..cf7e76001 100644 --- a/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt +++ b/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt @@ -69,8 +69,8 @@ class PhoneNumberUtils { ContactsContract.CommonDataKinds.Phone.TYPE_WORK_MOBILE -> "work,cell" ContactsContract.CommonDataKinds.Phone.TYPE_WORK_PAGER -> "work,pager" ContactsContract.CommonDataKinds.BaseTypes.TYPE_CUSTOM -> { - Log.i( - "$TAG Found custom phone label type using default value [$default] or 'custom' if null" + Log.d( + "$TAG Found custom phone label type using default value [$default] or will use 'custom' if null" ) default ?: "custom" }