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 67b93e15b..e46f44142 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 @@ -181,6 +181,16 @@ open class AccountLoginViewModel return@postOnCoreThread } + val accounts = core.accountList + val found = accounts.find { + it.params.identityAddress?.weakEqual(identityAddress) == true + } + if (found != null) { + Log.w("$TAG An account with the same identity address [${identityAddress.asStringUriOnly()}] already exists, do not add it again!") + showRedToast(R.string.assistant_account_login_already_connected_error, R.drawable.warning_circle) + return@postOnCoreThread + } + val user = identityAddress.username if (user == null) { Log.e( 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 e1676881f..ac2c57db8 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 @@ -203,6 +203,16 @@ class ThirdPartySipAccountLoginViewModel return@postOnCoreThread } + val accounts = core.accountList + val found = accounts.find { + it.params.identityAddress?.weakEqual(identityAddress) == true + } + if (found != null) { + Log.w("$TAG An account with the same identity address [${identityAddress.asStringUriOnly()}] already exists, do not add it again!") + showRedToast(R.string.assistant_account_login_already_connected_error, R.drawable.warning_circle) + return@postOnCoreThread + } + newlyCreatedAuthInfo = Factory.instance().createAuthInfo( user, userId, diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0693326d7..f0724223e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -106,6 +106,7 @@ Single sign on Adresse SIP invalide L\'adresse SIP ne contient pas de nom d\'utilisateur ! + Le compte est déjà connecté Pas encore de compte ? Créer un compte Confirmez votre numéro diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cfc3398f7..a4087876d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -145,6 +145,7 @@ Single sign on SIP address is invalid! SIP address doesn\'t contains a username! + Account already exists No account yet? Register Confirm your phone number