gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

align sorting with webUI

Browse Source 
(as far as possible atm)

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-04-15 09:31:47 +02:00 committed by Marcel Hibbe
parent 6b44ef8bb9
commit a51e9f7042
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -87,6 +87,7 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
import java.util.* import java.util.*
import javax.inject.Inject import javax.inject.Inject
import kotlin.collections.ArrayList
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
@ -695,12 +696,20 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
} else if (!left.isOnline && right.isOnline) { } else if (!left.isOnline && right.isOnline) {
return 1 return 1
} }
if (Participant.ParticipantType.MODERATOR == left.model.type && Participant.ParticipantType.MODERATOR != right.model.type) {
val moderatorTypes = ArrayList<Participant.ParticipantType>()
moderatorTypes.add(Participant.ParticipantType.MODERATOR)
moderatorTypes.add(Participant.ParticipantType.OWNER)
if (moderatorTypes.contains(left.model.type) && !moderatorTypes.contains(right.model.type)) {
return -1 return -1
} else if (Participant.ParticipantType.MODERATOR != left.model.type && Participant.ParticipantType.MODERATOR == right.model.type) { } else if (!moderatorTypes.contains(left.model.type) && moderatorTypes.contains(right.model.type)) {
return 1 return 1
} }
return left.model.displayName.compareTo(right.model.displayName)
return left.model.displayName.toLowerCase(Locale.ROOT).compareTo(
right.model.displayName.toLowerCase(Locale.ROOT)
)
} }
} }
} }