mirror of
https://github.com/oxen-io/session-android.git
synced 2025-10-10 11:09:46 +00:00
Merge branch 'dev' into add-unregister
This commit is contained in:
@@ -51,6 +51,7 @@ message Content {
|
||||
optional DataExtractionNotification dataExtractionNotification = 8;
|
||||
optional UnsendRequest unsendRequest = 9;
|
||||
optional MessageRequestResponse messageRequestResponse = 10;
|
||||
optional SharedConfigMessage sharedConfigMessage = 11;
|
||||
}
|
||||
|
||||
message KeyPair {
|
||||
@@ -238,6 +239,25 @@ message MessageRequestResponse {
|
||||
optional DataMessage.LokiProfile profile = 3;
|
||||
}
|
||||
|
||||
message SharedConfigMessage {
|
||||
enum Kind {
|
||||
USER_PROFILE = 1;
|
||||
CONTACTS = 2;
|
||||
CONVO_INFO_VOLATILE = 3;
|
||||
GROUPS = 4;
|
||||
CLOSED_GROUP_INFO = 5;
|
||||
CLOSED_GROUP_MEMBERS = 6;
|
||||
ENCRYPTION_KEYS = 7;
|
||||
}
|
||||
|
||||
// @required
|
||||
required Kind kind = 1;
|
||||
// @required
|
||||
required int64 seqno = 2;
|
||||
// @required
|
||||
required bytes data = 3;
|
||||
}
|
||||
|
||||
message ReceiptMessage {
|
||||
|
||||
enum Type {
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,12 +1,15 @@
|
||||
package org.session.libsignal.utilities
|
||||
|
||||
enum class IdPrefix(val value: String) {
|
||||
STANDARD("05"), BLINDED("15"), UN_BLINDED("00");
|
||||
STANDARD("05"), BLINDED("15"), UN_BLINDED("00"), BLINDEDV2("25");
|
||||
|
||||
fun isBlinded() = value == BLINDED.value || value == BLINDEDV2.value
|
||||
|
||||
companion object {
|
||||
fun fromValue(rawValue: String): IdPrefix? = when(rawValue.take(2)) {
|
||||
STANDARD.value -> STANDARD
|
||||
BLINDED.value -> BLINDED
|
||||
BLINDEDV2.value -> BLINDEDV2
|
||||
UN_BLINDED.value -> UN_BLINDED
|
||||
else -> null
|
||||
}
|
||||
|
@@ -1,7 +1,7 @@
|
||||
package org.session.libsignal.utilities
|
||||
|
||||
object Namespace {
|
||||
const val ALL = "all"
|
||||
const val DEFAULT = 0
|
||||
const val UNAUTHENTICATED_CLOSED_GROUP = -10
|
||||
const val CONFIGURATION = 5
|
||||
}
|
@@ -5,12 +5,16 @@ class Snode(val address: String, val port: Int, val publicKeySet: KeySet?) {
|
||||
|
||||
public enum class Method(val rawValue: String) {
|
||||
GetSwarm("get_snodes_for_pubkey"),
|
||||
GetMessages("retrieve"),
|
||||
Retrieve("retrieve"),
|
||||
SendMessage("store"),
|
||||
DeleteMessage("delete"),
|
||||
OxenDaemonRPCCall("oxend_request"),
|
||||
Info("info"),
|
||||
DeleteAll("delete_all")
|
||||
DeleteAll("delete_all"),
|
||||
Batch("batch"),
|
||||
Sequence("sequence"),
|
||||
Expire("expire"),
|
||||
GetExpiries("get_expiries")
|
||||
}
|
||||
|
||||
data class KeySet(val ed25519Key: String, val x25519Key: String)
|
||||
|
Reference in New Issue
Block a user