fix: add fully qualified handle for external results (WPB-6256) (#2676)

wireapp · Feb 8, 2024 · e7be962 · e7be962
1 parent 8f8a6e1
commit e7be962
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/app/src/main/kotlin/com/wire/android/mapper/ContactMapper.kt b/app/src/main/kotlin/com/wire/android/mapper/ContactMapper.kt
@@ -29,6 +29,7 @@ import com.wire.kalium.logic.data.publicuser.model.UserSearchDetails
 import com.wire.kalium.logic.data.service.ServiceDetails
 import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.OtherUser
+import com.wire.kalium.logic.data.user.type.UserType
 import javax.inject.Inject
 
 class ContactMapper
@@ -76,7 +77,7 @@ class ContactMapper
                 id = id.value,
                 domain = id.domain,
                 name = name ?: String.EMPTY,
-                label = handle ?: String.EMPTY,
+                label = mapUserHandle(user),
                 avatarData = UserAvatarData(
                     asset = previewAssetId?.let { ImageAsset.UserAvatarAsset(wireSessionImageLoader, it) }
                 ),
@@ -85,4 +86,14 @@ class ContactMapper
             )
         }
     }
+
+    /**
+     * Adds the fully qualified handle to the contact label in case of federated users.
+     */
+    private fun mapUserHandle(user: UserSearchDetails): String {
+        return when (user.type) {
+            UserType.FEDERATED -> "${user.handle}@${user.id.domain}"
+            else -> user.handle ?: String.EMPTY
+        }
+    }
 }