mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-11 14:57:45 +00:00
Merge branch 'fix_profile_nulls' into open_groups_V2
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java # app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java # libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt
This commit is contained in:
@@ -37,7 +37,11 @@ public class SignalServiceGroup {
|
||||
UPDATE,
|
||||
DELIVER,
|
||||
QUIT,
|
||||
REQUEST_INFO
|
||||
REQUEST_INFO,
|
||||
CREATION,
|
||||
NAME_CHANGE,
|
||||
MEMBER_ADDED,
|
||||
MEMBER_REMOVED
|
||||
}
|
||||
|
||||
private final byte[] groupId;
|
||||
|
Reference in New Issue
Block a user