TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-11 12:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI adjustment

Browse Source
This commit is contained in:
SessionHero01
2024-10-24 11:02:34 +11:00
parent 74f7bbb6d5
commit 6e1fa1b257
10 changed files with 245 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsession/src/main/java/org/session/libsession/messaging/groups/GroupManagerV2.kt
View File

@@ -42,7 +42,7 @@ interface GroupManagerV2 {
members: List<AccountId>
)
suspend fun handleMemberLeft(message: GroupUpdated, group: AccountId)
suspend fun handleMemberLeftMessage(memberId: AccountId, group: AccountId)
suspend fun leaveGroup(groupId:
AccountId, deleteOnLeave: Boolean)

9
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
View File

@@ -57,7 +57,6 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey
import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.messages.SignalServiceGroup
import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.protos.SignalServiceProtos.DataMessage.GroupUpdateMemberChangeMessage
import org.session.libsignal.protos.SignalServiceProtos.SharedConfigMessage
import org.session.libsignal.utilities.AccountId
import org.session.libsignal.utilities.Base64
@@ -675,8 +674,12 @@ private fun handleMemberChange(message: GroupUpdated, closedGroup: AccountId) {
private fun handleMemberLeft(message: GroupUpdated, closedGroup: AccountId) {
GlobalScope.launch(Dispatchers.Default) {
runCatching {
MessagingModuleConfiguration.shared.groupManagerV2.handleMemberLeft(message, closedGroup)
try {
MessagingModuleConfiguration.shared.groupManagerV2.handleMemberLeftMessage(
AccountId(message.sender!!), closedGroup
)
} catch (e: Exception) {
Log.e("GroupUpdated", "Failed to handle member left message", e)
}
}
}

3
libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
View File

@@ -209,11 +209,12 @@ object UpdateMessageBuilder {
if (historyShared) R.string.groupMemberNewYouHistoryMultiple else R.string.groupInviteYouAndMoreNew)
.put(COUNT_KEY, updateData.sessionIds.size - 1)
.format()
else -> Phrase.from(context,
number > 0 -> Phrase.from(context,
if (historyShared) R.string.groupMemberNewHistoryMultiple else R.string.groupMemberNewMultiple)
.put(NAME_KEY, context.youOrSender(updateData.sessionIds.first()))
.put(COUNT_KEY, updateData.sessionIds.size - 1)
.format()
else -> ""
}
}