From 04093860b58e7e8040a980ae1f683abd7d5de0da Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 12 Apr 2018 10:29:52 +0200
Subject: [PATCH] Fixed issue in GroupChat with contacts using phone number as
 username

---
 src/android/org/linphone/contacts/ContactAddress.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/android/org/linphone/contacts/ContactAddress.java b/src/android/org/linphone/contacts/ContactAddress.java
index b8ecc7736..e244dbb02 100644
--- a/src/android/org/linphone/contacts/ContactAddress.java
+++ b/src/android/org/linphone/contacts/ContactAddress.java
@@ -74,7 +74,12 @@ public class ContactAddress implements Serializable {
 
 	public Address getAddress() {
 		String presence = contact.getPresenceModelForUriOrTel(address);
-		return Factory.instance().createAddress(presence != null ? presence : address);
+		Address addr = Factory.instance().createAddress(presence != null ? presence : address);
+		// Remove the user=phone URI param if existing, it will break everything otherwise
+		if (addr.hasUriParam("user")) {
+			addr.removeUriParam("user");
+		}
+		return addr;
 	}
 
 	public void setSelect(boolean select) {