TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 11:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add more opengroupv2 functions and classes

Browse Source
This commit is contained in:
Harris 2021-04-14 23:25:38 +10:00
parent 75b40a2b55
commit 6f46bbefbe
3 changed files with 61 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libsession/src/main/java/org/session/libsession/messaging/opengroups/OpenGroupAPIV2.kt
View File

@ -1,10 +1,11 @@
package org.session.libsession.messaging.opengroups
import nl.komponents.kovenant.Promise
import org.session.libsession.messaging.opengroups.OpenGroupAPIV2.Error
import org.session.libsession.messaging.utilities.DotNetAPI
import java.util.*
class OpenGroupAPIV2: DotNetAPI() {
object OpenGroupAPIV2: DotNetAPI() {
enum class Error {
GENERIC,
@ -15,14 +16,14 @@ class OpenGroupAPIV2: DotNetAPI() {
NO_PUBLIC_KEY
}
companion object {
private val moderators: HashMap<String, HashMap<String, Set<String>>> = hashMapOf() // Server URL to (channel ID to set of moderator IDs)
const val DEFAULT_SERVER = "https://sessionopengroup.com"
const val DEFAULT_SERVER_PUBLIC_KEY = "658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231b"
private val moderators: HashMap<String, HashMap<String, Set<String>>> = hashMapOf() // Server URL to (channel ID to set of moderator IDs)
const val DEFAULT_SERVER = "https://sessionopengroup.com"
const val DEFAULT_SERVER_PUBLIC_KEY = "658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231b"
fun getMessages(room: String, server: String): Promise<List<OpenGroupV2Message>, Exception> {
}
}
data class Info(val id: String, val name: String, val imageId: String?)

52
libsession/src/main/java/org/session/libsession/messaging/opengroups/OpenGroupV2Message.kt Normal file
View File

@ -0,0 +1,52 @@
package org.session.libsession.messaging.opengroups
import org.session.libsession.messaging.MessagingConfiguration
import org.session.libsignal.utilities.Base64
import org.session.libsignal.utilities.logging.Log
import org.whispersystems.curve25519.Curve25519
data class OpenGroupV2Message(
val serverID: Long?,
val sender: String?,
val sentTimestamp: Long,
// The serialized protobuf in base64 encoding
val base64EncodedData: String,
// When sending a message, the sender signs the serialized protobuf with their private key so that
// a receiving user can verify that the message wasn't tampered with.
val base64EncodedSignature: String?
) {
companion object {
private val curve = Curve25519.getInstance(Curve25519.BEST)
}
fun sign(): OpenGroupV2Message? {
if (base64EncodedData.isEmpty()) return null
val (publicKey, privateKey) = MessagingConfiguration.shared.storage.getUserKeyPair() ?: return null
if (sender != publicKey) return null // only sign our own messages?
val signature = try {
curve.calculateSignature(privateKey, Base64.decode(base64EncodedData))
} catch (e: Exception) {
Log.e("Loki", "Couldn't sign OpenGroupV2Message", e)
return null
}
return copy(base64EncodedSignature = Base64.encodeBytes(signature))
}
fun toJSON(): Map<String, Any> {
val jsonMap = mutableMapOf("data" to base64EncodedData, "timestamp" to sentTimestamp)
serverID?.let { jsonMap["server_id"] = serverID }
sender?.let { jsonMap["public_key"] = sender }
base64EncodedSignature?.let { jsonMap["signature"] = base64EncodedSignature }
}
fun fromJSON(json: Map<String, Any>): OpenGroupV2Message? {
if (!json.containsKey("data") || !json.containsKey("timestamp")) return null
}
}

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt
View File

@ -76,7 +76,7 @@ class OpenGroupV2Poller(private val openGroup: OpenGroupV2, private val executor
fun generateDisplayName(rawDisplayName: String): String {
return "$rawDisplayName (...${senderPublicKey.takeLast(8)})"
}
val senderDisplayName = MessagingConfiguration.shared.storage.getOpenGroupDisplayName(senderPublicKey, openGroup.channel, openGroup.server) ?: generateDisplayName(message.displayName)
val senderDisplayName = MessagingConfiguration.shared.storage.getOpenGroupDisplayName(senderPublicKey, openGroup.room, openGroup.server) ?: generateDisplayName(message.displayName)
val id = openGroup.id.toByteArray()
// Main message
val dataMessageProto = SignalServiceProtos.DataMessage.newBuilder()