keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Fix group member name not showing (#939)

Browse Source
pull/1709/head
SessionHero01 3 months ago committed by GitHub
parent 47843ad96b
commit 2ebe469c49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

30
libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
Unescape Escape View File

@ -208,16 +208,16 @@ object UpdateMessageBuilder {
.format() .format()
number == 1 -> Phrase.from(context, number == 1 -> Phrase.from(context,
if (historyShared) R.string.groupMemberNewHistory else R.string.groupMemberNew) if (historyShared) R.string.groupMemberNewHistory else R.string.groupMemberNew)
.put(NAME_KEY, context.youOrSender(updateData.sessionIds.first())) .put(NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first()))
.format() .format()
number == 2 && containsUser -> Phrase.from(context, number == 2 && containsUser -> Phrase.from(context,
if (historyShared) R.string.groupMemberNewYouHistoryTwo else R.string.groupInviteYouAndOtherNew) if (historyShared) R.string.groupMemberNewYouHistoryTwo else R.string.groupInviteYouAndOtherNew)
.put(OTHER_NAME_KEY, context.youOrSender(updateData.sessionIds.first { it != userPublicKey })) .put(OTHER_NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first { it != userPublicKey }))
.format() .format()
number == 2 -> Phrase.from(context, number == 2 -> Phrase.from(context,
if (historyShared) R.string.groupMemberNewHistoryTwo else R.string.groupMemberNewTwo) if (historyShared) R.string.groupMemberNewHistoryTwo else R.string.groupMemberNewTwo)
.put(NAME_KEY, context.youOrSender(updateData.sessionIds.first())) .put(NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first()))
.put(OTHER_NAME_KEY, context.youOrSender(updateData.sessionIds.last())) .put(OTHER_NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.last()))
.format() .format()
containsUser -> Phrase.from(context, containsUser -> Phrase.from(context,
if (historyShared) R.string.groupMemberNewYouHistoryMultiple else R.string.groupInviteYouAndMoreNew) if (historyShared) R.string.groupMemberNewYouHistoryMultiple else R.string.groupInviteYouAndMoreNew)
@ -225,7 +225,7 @@ object UpdateMessageBuilder {
.format() .format()
number > 0 -> Phrase.from(context, number > 0 -> Phrase.from(context,
if (historyShared) R.string.groupMemberNewHistoryMultiple else R.string.groupMemberNewMultiple) if (historyShared) R.string.groupMemberNewHistoryMultiple else R.string.groupMemberNewMultiple)
.put(NAME_KEY, context.youOrSender(updateData.sessionIds.first())) .put(NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first()))
.put(COUNT_KEY, updateData.sessionIds.size - 1) .put(COUNT_KEY, updateData.sessionIds.size - 1)
.format() .format()
else -> "" else -> ""
@ -239,16 +239,16 @@ object UpdateMessageBuilder {
) )
number == 1 -> Phrase.from(context, number == 1 -> Phrase.from(context,
R.string.adminPromotedToAdmin) R.string.adminPromotedToAdmin)
.put(NAME_KEY,context.youOrSender(updateData.sessionIds.first())) .put(NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first()))
.format() .format()
number == 2 && containsUser -> Phrase.from(context, number == 2 && containsUser -> Phrase.from(context,
R.string.groupPromotedYouTwo) R.string.groupPromotedYouTwo)
.put(OTHER_NAME_KEY, context.youOrSender(updateData.sessionIds.first{ it != userPublicKey })) .put(OTHER_NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first{ it != userPublicKey }))
.format() .format()
number == 2 -> Phrase.from(context, number == 2 -> Phrase.from(context,
R.string.adminTwoPromotedToAdmin) R.string.adminTwoPromotedToAdmin)
.put(NAME_KEY, context.youOrSender(updateData.sessionIds.first())) .put(NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first()))
.put(OTHER_NAME_KEY, context.youOrSender(updateData.sessionIds.last())) .put(OTHER_NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.last()))
.format() .format()
containsUser -> Phrase.from(context, containsUser -> Phrase.from(context,
R.string.groupPromotedYouMultiple) R.string.groupPromotedYouMultiple)
@ -256,7 +256,7 @@ object UpdateMessageBuilder {
.format() .format()
else -> Phrase.from(context, else -> Phrase.from(context,
R.string.adminMorePromotedToAdmin) R.string.adminMorePromotedToAdmin)
.put(NAME_KEY, context.youOrSender(updateData.sessionIds.first())) .put(NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first()))
.put(COUNT_KEY, updateData.sessionIds.size - 1) .put(COUNT_KEY, updateData.sessionIds.size - 1)
.format() .format()
} }
@ -268,16 +268,16 @@ object UpdateMessageBuilder {
R.string.groupRemovedYouGeneral).format() R.string.groupRemovedYouGeneral).format()
number == 1 -> Phrase.from(context, number == 1 -> Phrase.from(context,
R.string.groupRemoved) R.string.groupRemoved)
.put(NAME_KEY, context.youOrSender(updateData.sessionIds.first())) .put(NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first()))
.format() .format()
number == 2 && containsUser -> Phrase.from(context, number == 2 && containsUser -> Phrase.from(context,
R.string.groupRemovedYouTwo) R.string.groupRemovedYouTwo)
.put(OTHER_NAME_KEY, context.youOrSender(updateData.sessionIds.first { it != userPublicKey })) .put(OTHER_NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first { it != userPublicKey }))
.format() .format()
number == 2 -> Phrase.from(context, number == 2 -> Phrase.from(context,
R.string.groupRemovedTwo) R.string.groupRemovedTwo)
.put(NAME_KEY, context.youOrSender(updateData.sessionIds.first())) .put(NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first()))
.put(OTHER_NAME_KEY, context.youOrSender(updateData.sessionIds.last())) .put(OTHER_NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.last()))
.format() .format()
containsUser -> Phrase.from(context, containsUser -> Phrase.from(context,
R.string.groupRemovedYouMultiple) R.string.groupRemovedYouMultiple)
@ -285,7 +285,7 @@ object UpdateMessageBuilder {
.format() .format()
else -> Phrase.from(context, else -> Phrase.from(context,
R.string.groupRemovedMultiple) R.string.groupRemovedMultiple)
.put(NAME_KEY, context.youOrSender(updateData.sessionIds.first())) .put(NAME_KEY, getGroupMemberName(groupId, updateData.sessionIds.first()))
.put(COUNT_KEY, updateData.sessionIds.size - 1) .put(COUNT_KEY, updateData.sessionIds.size - 1)
.format() .format()
} }

Write Preview
Loading…
Cancel
Save