From 860cf0c7a7c95723ed86d5877b54ab61a6e967f0 Mon Sep 17 00:00:00 2001
From: Maxime Callet <maximecallet@savoirfairelinux.com>
Date: Wed, 9 Feb 2022 17:17:54 -0500
Subject: [PATCH] Account: modify check when updating displayName
Change-Id: I7b9b6621f541b933cefeaeac1c6d81f23de38a58
---
.../main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt b/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt
index bd2425388..ad858f97a 100644
--- a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt
+++ b/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt
@@ -122,7 +122,7 @@ class JamiAccountSummaryPresenter @Inject constructor(
mCompositeDisposable.add(VCardUtils.loadLocalProfileFromDiskWithDefault(filesDir, accountId)
.doOnSuccess { vcard: VCard ->
val previousName = vcard.formattedName?.value
- if (StringUtils.isEmpty(previousName) == StringUtils.isEmpty(username) || previousName == username)
+ if ( (StringUtils.isEmpty(previousName) && StringUtils.isEmpty(username)) || previousName == username)
throw IllegalArgumentException("Name didn't change")
vcard.setFormattedName(username)
vcard.removeProperties(RawProperty::class.java)
--
GitLab