mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-27 20:15:21 +00:00
handle visible message & handle group update
This commit is contained in:
parent
886ca5c72b
commit
c9673447c6
@ -1,16 +1,19 @@
|
|||||||
package org.session.libsession.messaging.sending_receiving
|
package org.session.libsession.messaging.sending_receiving
|
||||||
|
|
||||||
import org.session.libsession.messaging.MessagingConfiguration
|
import org.session.libsession.messaging.MessagingConfiguration
|
||||||
|
import org.session.libsession.messaging.jobs.AttachmentDownloadJob
|
||||||
import org.session.libsession.messaging.messages.Destination
|
import org.session.libsession.messaging.messages.Destination
|
||||||
import org.session.libsession.messaging.messages.Message
|
import org.session.libsession.messaging.messages.Message
|
||||||
import org.session.libsession.messaging.messages.control.ClosedGroupUpdate
|
import org.session.libsession.messaging.messages.control.ClosedGroupUpdate
|
||||||
import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
|
import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
|
||||||
import org.session.libsession.messaging.messages.control.ReadReceipt
|
import org.session.libsession.messaging.messages.control.ReadReceipt
|
||||||
import org.session.libsession.messaging.messages.control.TypingIndicator
|
import org.session.libsession.messaging.messages.control.TypingIndicator
|
||||||
|
import org.session.libsession.messaging.messages.visible.Attachment
|
||||||
import org.session.libsession.messaging.messages.visible.VisibleMessage
|
import org.session.libsession.messaging.messages.visible.VisibleMessage
|
||||||
import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI
|
import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI
|
||||||
import org.session.libsession.messaging.threads.Address
|
import org.session.libsession.messaging.threads.Address
|
||||||
import org.session.libsession.utilities.GroupUtil
|
import org.session.libsession.utilities.GroupUtil
|
||||||
|
import org.session.libsignal.libsignal.logging.Log
|
||||||
import org.session.libsignal.libsignal.util.Hex
|
import org.session.libsignal.libsignal.util.Hex
|
||||||
|
|
||||||
import org.session.libsignal.service.internal.push.SignalServiceProtos
|
import org.session.libsignal.service.internal.push.SignalServiceProtos
|
||||||
@ -20,6 +23,7 @@ import org.session.libsignal.service.loki.protocol.closedgroups.ClosedGroupSende
|
|||||||
import org.session.libsignal.service.loki.protocol.closedgroups.SharedSenderKeysImplementation
|
import org.session.libsignal.service.loki.protocol.closedgroups.SharedSenderKeysImplementation
|
||||||
import org.session.libsignal.service.loki.utilities.toHexString
|
import org.session.libsignal.service.loki.utilities.toHexString
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
import kotlin.collections.ArrayList
|
||||||
|
|
||||||
internal fun MessageReceiver.isBlock(publicKey: String): Boolean {
|
internal fun MessageReceiver.isBlock(publicKey: String): Boolean {
|
||||||
// TODO: move isBlocked from Recipient to BlockManager
|
// TODO: move isBlocked from Recipient to BlockManager
|
||||||
@ -76,7 +80,41 @@ fun MessageReceiver.disableExpirationTimer(senderPublicKey: String, groupPublicK
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalServiceProtos.Content, openGroupID: String?) {
|
fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalServiceProtos.Content, openGroupID: String?) {
|
||||||
|
val storage = MessagingConfiguration.shared.storage
|
||||||
|
// Parse & persist attachments
|
||||||
|
val attachments = proto.dataMessage.attachmentsList.mapNotNull { proto ->
|
||||||
|
val attachment = Attachment.fromProto(proto)
|
||||||
|
if (attachment == null || !attachment.isValid()) {
|
||||||
|
return@mapNotNull null
|
||||||
|
} else {
|
||||||
|
return@mapNotNull attachment
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val attachmentIDs = storage.persist(attachments)
|
||||||
|
message.attachmentIDs = attachmentIDs as ArrayList<String>
|
||||||
|
var attachmentsToDownload = attachmentIDs
|
||||||
|
// Update profile if needed
|
||||||
|
val newProfile = message.profile
|
||||||
|
if (newProfile != null) {
|
||||||
|
|
||||||
|
}
|
||||||
|
// Get or create thread
|
||||||
|
val threadID = storage.getOrCreateThreadIdFor(message.sender!!, message.groupPublicKey, openGroupID) ?: throw MessageSender.Error.NoThread
|
||||||
|
// Parse quote if needed
|
||||||
|
if (message.quote != null && proto.dataMessage.hasQuote()) {
|
||||||
|
// TODO
|
||||||
|
}
|
||||||
|
// Parse link preview if needed
|
||||||
|
if (message.linkPreview != null && proto.dataMessage.previewCount > 0) {
|
||||||
|
// TODO
|
||||||
|
}
|
||||||
|
// Persist the message
|
||||||
|
message.threadID = threadID
|
||||||
|
// Start attachment downloads if needed
|
||||||
|
attachmentsToDownload.forEach { attachmentID ->
|
||||||
|
val downloadJob = AttachmentDownloadJob()
|
||||||
|
}
|
||||||
|
// TODO finish this process
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun MessageReceiver.handleClosedGroupUpdate(message: ClosedGroupUpdate) {
|
private fun MessageReceiver.handleClosedGroupUpdate(message: ClosedGroupUpdate) {
|
||||||
@ -91,6 +129,7 @@ private fun MessageReceiver.handleClosedGroupUpdate(message: ClosedGroupUpdate)
|
|||||||
private fun MessageReceiver.handleNewGroup(message: ClosedGroupUpdate) {
|
private fun MessageReceiver.handleNewGroup(message: ClosedGroupUpdate) {
|
||||||
val storage = MessagingConfiguration.shared.storage
|
val storage = MessagingConfiguration.shared.storage
|
||||||
val sskDatabase = MessagingConfiguration.shared.sskDatabase
|
val sskDatabase = MessagingConfiguration.shared.sskDatabase
|
||||||
|
if (message.kind !is ClosedGroupUpdate.Kind.New) { return }
|
||||||
val kind = message.kind!! as ClosedGroupUpdate.Kind.New
|
val kind = message.kind!! as ClosedGroupUpdate.Kind.New
|
||||||
val groupPublicKey = kind.groupPublicKey.toHexString()
|
val groupPublicKey = kind.groupPublicKey.toHexString()
|
||||||
val name = kind.name
|
val name = kind.name
|
||||||
@ -143,7 +182,66 @@ private fun MessageReceiver.handleNewGroup(message: ClosedGroupUpdate) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun MessageReceiver.handleGroupUpdate(message: ClosedGroupUpdate) {
|
private fun MessageReceiver.handleGroupUpdate(message: ClosedGroupUpdate) {
|
||||||
|
val storage = MessagingConfiguration.shared.storage
|
||||||
|
val sskDatabase = MessagingConfiguration.shared.sskDatabase
|
||||||
|
if (message.kind !is ClosedGroupUpdate.Kind.Info) { return }
|
||||||
|
val kind = message.kind!! as ClosedGroupUpdate.Kind.Info
|
||||||
|
val groupPublicKey = kind.groupPublicKey.toHexString()
|
||||||
|
val name = kind.name
|
||||||
|
val senderKeys = kind.senderKeys
|
||||||
|
val members = kind.members.map { it.toHexString() }
|
||||||
|
val admins = kind.admins.map { it.toHexString() }
|
||||||
|
// Get the group
|
||||||
|
val groupID = GroupUtil.getEncodedClosedGroupID(groupPublicKey)
|
||||||
|
val group = storage.getGroup(groupID) ?: return Log.d("Loki", "Ignoring closed group info message for nonexistent group.")
|
||||||
|
// Check that the sender is a member of the group (before the update)
|
||||||
|
if (!group.members.contains(Address.fromSerialized(message.sender!!))) { return Log.d("Loki", "Ignoring closed group info message from non-member.") }
|
||||||
|
// Store the ratchets for any new members (it's important that this happens before the code below)
|
||||||
|
senderKeys.forEach { senderKey ->
|
||||||
|
val ratchet = ClosedGroupRatchet(senderKey.chainKey.toHexString(), senderKey.keyIndex, listOf())
|
||||||
|
sskDatabase.setClosedGroupRatchet(groupPublicKey, senderKey.publicKey.toHexString(), ratchet, ClosedGroupRatchetCollectionType.Current)
|
||||||
|
}
|
||||||
|
// Delete all ratchets and either:
|
||||||
|
// • Send out the user's new ratchet using established channels if other members of the group left or were removed
|
||||||
|
// • Remove the group from the user's set of public keys to poll for if the current user was among the members that were removed
|
||||||
|
val oldMembers = group.members.map { it.serialize() }.toSet()
|
||||||
|
val userPublicKey = storage.getUserPublicKey()!!
|
||||||
|
val wasUserRemoved = !members.contains(userPublicKey)
|
||||||
|
if (members.toSet().intersect(oldMembers) != oldMembers.toSet()) {
|
||||||
|
val allOldRatchets = sskDatabase.getAllClosedGroupRatchets(groupPublicKey, ClosedGroupRatchetCollectionType.Current)
|
||||||
|
for (pair in allOldRatchets) {
|
||||||
|
val senderPublicKey = pair.first
|
||||||
|
val ratchet = pair.second
|
||||||
|
val collection = ClosedGroupRatchetCollectionType.Old
|
||||||
|
sskDatabase.setClosedGroupRatchet(groupPublicKey, senderPublicKey, ratchet, collection)
|
||||||
|
}
|
||||||
|
sskDatabase.removeAllClosedGroupRatchets(groupPublicKey, ClosedGroupRatchetCollectionType.Current)
|
||||||
|
if (wasUserRemoved) {
|
||||||
|
sskDatabase.removeClosedGroupPrivateKey(groupPublicKey)
|
||||||
|
storage.setActive(groupID, false)
|
||||||
|
storage.removeMember(groupID, Address.fromSerialized(userPublicKey))
|
||||||
|
// Notify the PN server
|
||||||
|
PushNotificationAPI.performOperation(PushNotificationAPI.ClosedGroupOperation.Unsubscribe, groupPublicKey, userPublicKey)
|
||||||
|
} else {
|
||||||
|
val userRatchet = SharedSenderKeysImplementation.shared.generateRatchet(groupPublicKey, userPublicKey)
|
||||||
|
val userSenderKey = ClosedGroupSenderKey(Hex.fromStringCondensed(userRatchet.chainKey), userRatchet.keyIndex, Hex.fromStringCondensed(userPublicKey))
|
||||||
|
members.forEach { member ->
|
||||||
|
if (member == userPublicKey) return@forEach
|
||||||
|
val address = Address.fromSerialized(member)
|
||||||
|
val closedGroupUpdateKind = ClosedGroupUpdate.Kind.SenderKey(Hex.fromStringCondensed(groupPublicKey), userSenderKey)
|
||||||
|
val closedGroupUpdate = ClosedGroupUpdate()
|
||||||
|
closedGroupUpdate.kind = closedGroupUpdateKind
|
||||||
|
MessageSender.send(closedGroupUpdate, address)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Update the group
|
||||||
|
storage.updateTitle(groupID, name)
|
||||||
|
storage.updateMembers(groupID, members.map { Address.fromSerialized(it) })
|
||||||
|
// Notify the user if needed
|
||||||
|
val infoType = if (wasUserRemoved) SignalServiceProtos.GroupContext.Type.QUIT else SignalServiceProtos.GroupContext.Type.UPDATE
|
||||||
|
val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
|
||||||
|
// TODO insertOutgoingInfoMessage(context, groupID, infoType, name, members, admins, threadID)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun MessageReceiver.handleSenderKeyRequest(message: ClosedGroupUpdate) {
|
private fun MessageReceiver.handleSenderKeyRequest(message: ClosedGroupUpdate) {
|
||||||
|
Loading…
Reference in New Issue
Block a user