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

Merge branch 'dev' of https://github.com/loki-project/session-android into refactor_clean_0

Browse Source
This commit is contained in:
Ryan ZHAO
2021-02-24 16:39:04 +11:00
parent 2bb07c8a38 851efb6f6e
commit d5343d5462
21 changed files with 546 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libsignal/protobuf/Makefile
View File

@@ -2,4 +2,3 @@
all:
protoc25 --java_out=../src/main/java/ SignalService.proto WebSocketResources.proto
protoc25 --java_out=../src/main/java/ UnidentifiedDelivery.proto
protoc25 --java_out=../src/main/java/ WhisperTextProtocol.proto

7
libsignal/protobuf/SignalService.proto
View File

@@ -223,8 +223,11 @@ message ConfigurationMessage {
repeated bytes admins = 5;
}
repeated ClosedGroup closedGroups = 1;
repeated string openGroups = 2;
repeated ClosedGroup closedGroups = 1;
repeated string openGroups = 2;
optional string displayName = 3;
optional string profilePicture = 4;
optional bytes profileKey = 5;
}
message ReceiptMessage {