mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 05:31:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improve interface, name are not nullable

Browse source
This commit is contained in:
Benoit Marty 2021-04-07 15:17:02 +02:00
parent 0a0e3c3319
commit 15c51cad17
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
View file

@ -26,15 +26,15 @@ class TestRoomDisplayNameFallbackProvider : RoomDisplayNameFallbackProvider {
override fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>) = override fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>) =
"Empty room" "Empty room"
override fun getNameFor2members(name1: String?, name2: String?) = override fun getNameFor2members(name1: String, name2: String) =
"$name1 and $name2" "$name1 and $name2"
override fun getNameFor3members(name1: String?, name2: String?, name3: String?) = override fun getNameFor3members(name1: String, name2: String, name3: String) =
"$name1, $name2 and $name3" "$name1, $name2 and $name3"
override fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?) = override fun getNameFor4members(name1: String, name2: String, name3: String, name4: String) =
"$name1, $name2, $name3 and $name4" "$name1, $name2, $name3 and $name4"
override fun getNameFor4membersAndMore(name1: String?, name2: String?, name3: String?, remainingCount: Int) = override fun getNameFor4membersAndMore(name1: String, name2: String, name3: String, remainingCount: Int) =
"$name1, $name2, $name3 and $remainingCount others" "$name1, $name2, $name3 and $remainingCount others"
} }

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
View file

@ -19,8 +19,8 @@ package org.matrix.android.sdk.api
interface RoomDisplayNameFallbackProvider { interface RoomDisplayNameFallbackProvider {
fun getNameForRoomInvite(): String fun getNameForRoomInvite(): String
fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>): String fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>): String
fun getNameFor2members(name1: String?, name2: String?): String fun getNameFor2members(name1: String, name2: String): String
fun getNameFor3members(name1: String?, name2: String?, name3: String?): String fun getNameFor3members(name1: String, name2: String, name3: String): String
fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?): String fun getNameFor4members(name1: String, name2: String, name3: String, name4: String): String
fun getNameFor4membersAndMore(name1: String?, name2: String?, name3: String?, remainingCount: Int): String fun getNameFor4membersAndMore(name1: String, name2: String, name3: String, remainingCount: Int): String
} }

5
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
View file

@ -149,9 +149,8 @@ internal class RoomDisplayNameResolver @Inject constructor(
} }
/** See [org.matrix.android.sdk.api.session.room.sender.SenderInfo.disambiguatedDisplayName] */ /** See [org.matrix.android.sdk.api.session.room.sender.SenderInfo.disambiguatedDisplayName] */
private fun resolveRoomMemberName(roomMemberSummary: RoomMemberSummaryEntity?, private fun resolveRoomMemberName(roomMemberSummary: RoomMemberSummaryEntity,
roomMemberHelper: RoomMemberHelper): String? { roomMemberHelper: RoomMemberHelper): String {
if (roomMemberSummary == null) return null
val isUnique = roomMemberHelper.isUniqueDisplayName(roomMemberSummary.displayName) val isUnique = roomMemberHelper.isUniqueDisplayName(roomMemberSummary.displayName)
return if (isUnique) { return if (isUnique) {
roomMemberSummary.getBestName() roomMemberSummary.getBestName()

8
vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
View file

@ -36,19 +36,19 @@ class VectorRoomDisplayNameFallbackProvider(
} }
} }
override fun getNameFor2members(name1: String?, name2: String?): String { override fun getNameFor2members(name1: String, name2: String): String {
return context.getString(R.string.room_displayname_two_members, name1, name2) return context.getString(R.string.room_displayname_two_members, name1, name2)
} }
override fun getNameFor3members(name1: String?, name2: String?, name3: String?): String { override fun getNameFor3members(name1: String, name2: String, name3: String): String {
return context.getString(R.string.room_displayname_3_members, name1, name2, name3) return context.getString(R.string.room_displayname_3_members, name1, name2, name3)
} }
override fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?): String { override fun getNameFor4members(name1: String, name2: String, name3: String, name4: String): String {
return context.getString(R.string.room_displayname_4_members, name1, name2, name3, name4) return context.getString(R.string.room_displayname_4_members, name1, name2, name3, name4)
} }
override fun getNameFor4membersAndMore(name1: String?, name2: String?, name3: String?, remainingCount: Int): String { override fun getNameFor4membersAndMore(name1: String, name2: String, name3: String, remainingCount: Int): String {
return context.resources.getQuantityString( return context.resources.getQuantityString(
R.plurals.room_displayname_four_and_more_members, R.plurals.room_displayname_four_and_more_members,
remainingCount, remainingCount,