diff --git a/libsignal/protobuf/SignalService.proto b/libsignal/protobuf/SignalService.proto
index 614b5e65f2..17379e82fd 100644
--- a/libsignal/protobuf/SignalService.proto
+++ b/libsignal/protobuf/SignalService.proto
@@ -304,12 +304,6 @@ message GroupContext {
repeated string members = 4;
optional AttachmentPointer avatar = 5;
repeated string admins = 6;
-
- // Loki - These fields are only used internally for the Android code base.
- // This is so that we can differentiate adding/kicking.
- // DO NOT USE WHEN SENDING MESSAGES.
- repeated string newMembers = 998;
- repeated string removedMembers = 999;
}
message ContactDetails {
diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java
index 0e4feba1ed..bd6b30747f 100644
--- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java
+++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java
@@ -26967,70 +26967,6 @@ public final class SignalServiceProtos {
*/
com.google.protobuf.ByteString
getAdminsBytes(int index);
-
- // repeated string newMembers = 998;
- /**
- * repeated string newMembers = 998;
- *
- *
- * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - java.util.List
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - int getNewMembersCount(); - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - java.lang.String getNewMembers(int index); - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - com.google.protobuf.ByteString - getNewMembersBytes(int index); - - // repeated string removedMembers = 999; - /** - *
repeated string removedMembers = 999;
- */
- java.util.Listrepeated string removedMembers = 999;
- */
- int getRemovedMembersCount();
- /**
- * repeated string removedMembers = 999;
- */
- java.lang.String getRemovedMembers(int index);
- /**
- * repeated string removedMembers = 999;
- */
- com.google.protobuf.ByteString
- getRemovedMembersBytes(int index);
}
/**
* Protobuf type {@code signalservice.GroupContext}
@@ -27133,22 +27069,6 @@ public final class SignalServiceProtos {
admins_.add(input.readBytes());
break;
}
- case 7986: {
- if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
- newMembers_ = new com.google.protobuf.LazyStringArrayList();
- mutable_bitField0_ |= 0x00000040;
- }
- newMembers_.add(input.readBytes());
- break;
- }
- case 7994: {
- if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
- removedMembers_ = new com.google.protobuf.LazyStringArrayList();
- mutable_bitField0_ |= 0x00000080;
- }
- removedMembers_.add(input.readBytes());
- break;
- }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -27163,12 +27083,6 @@ public final class SignalServiceProtos {
if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
admins_ = new com.google.protobuf.UnmodifiableLazyStringList(admins_);
}
- if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
- newMembers_ = new com.google.protobuf.UnmodifiableLazyStringList(newMembers_);
- }
- if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
- removedMembers_ = new com.google.protobuf.UnmodifiableLazyStringList(removedMembers_);
- }
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
@@ -27483,90 +27397,6 @@ public final class SignalServiceProtos {
return admins_.getByteString(index);
}
- // repeated string newMembers = 998;
- public static final int NEWMEMBERS_FIELD_NUMBER = 998;
- private com.google.protobuf.LazyStringList newMembers_;
- /**
- * repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public java.util.List
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public int getNewMembersCount() { - return newMembers_.size(); - } - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public java.lang.String getNewMembers(int index) { - return newMembers_.get(index); - } - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public com.google.protobuf.ByteString - getNewMembersBytes(int index) { - return newMembers_.getByteString(index); - } - - // repeated string removedMembers = 999; - public static final int REMOVEDMEMBERS_FIELD_NUMBER = 999; - private com.google.protobuf.LazyStringList removedMembers_; - /** - *
repeated string removedMembers = 999;
- */
- public java.util.Listrepeated string removedMembers = 999;
- */
- public int getRemovedMembersCount() {
- return removedMembers_.size();
- }
- /**
- * repeated string removedMembers = 999;
- */
- public java.lang.String getRemovedMembers(int index) {
- return removedMembers_.get(index);
- }
- /**
- * repeated string removedMembers = 999;
- */
- public com.google.protobuf.ByteString
- getRemovedMembersBytes(int index) {
- return removedMembers_.getByteString(index);
- }
-
private void initFields() {
id_ = com.google.protobuf.ByteString.EMPTY;
type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.UNKNOWN;
@@ -27574,8 +27404,6 @@ public final class SignalServiceProtos {
members_ = com.google.protobuf.LazyStringArrayList.EMPTY;
avatar_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance();
admins_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- newMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- removedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -27607,12 +27435,6 @@ public final class SignalServiceProtos {
for (int i = 0; i < admins_.size(); i++) {
output.writeBytes(6, admins_.getByteString(i));
}
- for (int i = 0; i < newMembers_.size(); i++) {
- output.writeBytes(998, newMembers_.getByteString(i));
- }
- for (int i = 0; i < removedMembers_.size(); i++) {
- output.writeBytes(999, removedMembers_.getByteString(i));
- }
getUnknownFields().writeTo(output);
}
@@ -27656,24 +27478,6 @@ public final class SignalServiceProtos {
size += dataSize;
size += 1 * getAdminsList().size();
}
- {
- int dataSize = 0;
- for (int i = 0; i < newMembers_.size(); i++) {
- dataSize += com.google.protobuf.CodedOutputStream
- .computeBytesSizeNoTag(newMembers_.getByteString(i));
- }
- size += dataSize;
- size += 2 * getNewMembersList().size();
- }
- {
- int dataSize = 0;
- for (int i = 0; i < removedMembers_.size(); i++) {
- dataSize += com.google.protobuf.CodedOutputStream
- .computeBytesSizeNoTag(removedMembers_.getByteString(i));
- }
- size += dataSize;
- size += 2 * getRemovedMembersList().size();
- }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -27807,10 +27611,6 @@ public final class SignalServiceProtos {
bitField0_ = (bitField0_ & ~0x00000010);
admins_ = com.google.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000020);
- newMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000040);
- removedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
@@ -27871,18 +27671,6 @@ public final class SignalServiceProtos {
bitField0_ = (bitField0_ & ~0x00000020);
}
result.admins_ = admins_;
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
- newMembers_ = new com.google.protobuf.UnmodifiableLazyStringList(
- newMembers_);
- bitField0_ = (bitField0_ & ~0x00000040);
- }
- result.newMembers_ = newMembers_;
- if (((bitField0_ & 0x00000080) == 0x00000080)) {
- removedMembers_ = new com.google.protobuf.UnmodifiableLazyStringList(
- removedMembers_);
- bitField0_ = (bitField0_ & ~0x00000080);
- }
- result.removedMembers_ = removedMembers_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -27933,26 +27721,6 @@ public final class SignalServiceProtos {
}
onChanged();
}
- if (!other.newMembers_.isEmpty()) {
- if (newMembers_.isEmpty()) {
- newMembers_ = other.newMembers_;
- bitField0_ = (bitField0_ & ~0x00000040);
- } else {
- ensureNewMembersIsMutable();
- newMembers_.addAll(other.newMembers_);
- }
- onChanged();
- }
- if (!other.removedMembers_.isEmpty()) {
- if (removedMembers_.isEmpty()) {
- removedMembers_ = other.removedMembers_;
- bitField0_ = (bitField0_ & ~0x00000080);
- } else {
- ensureRemovedMembersIsMutable();
- removedMembers_.addAll(other.removedMembers_);
- }
- onChanged();
- }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -28461,246 +28229,6 @@ public final class SignalServiceProtos {
return this;
}
- // repeated string newMembers = 998;
- private com.google.protobuf.LazyStringList newMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- private void ensureNewMembersIsMutable() {
- if (!((bitField0_ & 0x00000040) == 0x00000040)) {
- newMembers_ = new com.google.protobuf.LazyStringArrayList(newMembers_);
- bitField0_ |= 0x00000040;
- }
- }
- /**
- * repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public java.util.List
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public int getNewMembersCount() { - return newMembers_.size(); - } - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public java.lang.String getNewMembers(int index) { - return newMembers_.get(index); - } - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public com.google.protobuf.ByteString - getNewMembersBytes(int index) { - return newMembers_.getByteString(index); - } - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public Builder setNewMembers( - int index, java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureNewMembersIsMutable(); - newMembers_.set(index, value); - onChanged(); - return this; - } - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public Builder addNewMembers( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureNewMembersIsMutable(); - newMembers_.add(value); - onChanged(); - return this; - } - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public Builder addAllNewMembers( - java.lang.Iterable
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public Builder clearNewMembers() { - newMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000040); - onChanged(); - return this; - } - /** - *
repeated string newMembers = 998;
- *
- * - * Loki - These fields are only used internally for the Android code base. - * This is so that we can differentiate adding/kicking. - * DO NOT USE WHEN SENDING MESSAGES. - *- */ - public Builder addNewMembersBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - ensureNewMembersIsMutable(); - newMembers_.add(value); - onChanged(); - return this; - } - - // repeated string removedMembers = 999; - private com.google.protobuf.LazyStringList removedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY; - private void ensureRemovedMembersIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { - removedMembers_ = new com.google.protobuf.LazyStringArrayList(removedMembers_); - bitField0_ |= 0x00000080; - } - } - /** - *
repeated string removedMembers = 999;
- */
- public java.util.Listrepeated string removedMembers = 999;
- */
- public int getRemovedMembersCount() {
- return removedMembers_.size();
- }
- /**
- * repeated string removedMembers = 999;
- */
- public java.lang.String getRemovedMembers(int index) {
- return removedMembers_.get(index);
- }
- /**
- * repeated string removedMembers = 999;
- */
- public com.google.protobuf.ByteString
- getRemovedMembersBytes(int index) {
- return removedMembers_.getByteString(index);
- }
- /**
- * repeated string removedMembers = 999;
- */
- public Builder setRemovedMembers(
- int index, java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureRemovedMembersIsMutable();
- removedMembers_.set(index, value);
- onChanged();
- return this;
- }
- /**
- * repeated string removedMembers = 999;
- */
- public Builder addRemovedMembers(
- java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureRemovedMembersIsMutable();
- removedMembers_.add(value);
- onChanged();
- return this;
- }
- /**
- * repeated string removedMembers = 999;
- */
- public Builder addAllRemovedMembers(
- java.lang.Iterablerepeated string removedMembers = 999;
- */
- public Builder clearRemovedMembers() {
- removedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000080);
- onChanged();
- return this;
- }
- /**
- * repeated string removedMembers = 999;
- */
- public Builder addRemovedMembersBytes(
- com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureRemovedMembersIsMutable();
- removedMembers_.add(value);
- onChanged();
- return this;
- }
-
// @@protoc_insertion_point(builder_scope:signalservice.GroupContext)
}
@@ -33464,29 +32992,28 @@ public final class SignalServiceProtos {
"\020\n\010fileName\030\007 \001(\t\022\r\n\005flags\030\010 \001(\r\022\r\n\005widt",
"h\030\t \001(\r\022\016\n\006height\030\n \001(\r\022\017\n\007caption\030\013 \001(\t" +
"\022\013\n\003url\030e \001(\t\"\032\n\005Flags\022\021\n\rVOICE_MESSAGE\020" +
- "\001\"\243\002\n\014GroupContext\022\n\n\002id\030\001 \001(\014\022.\n\004type\030\002" +
+ "\001\"\365\001\n\014GroupContext\022\n\n\002id\030\001 \001(\014\022.\n\004type\030\002" +
" \001(\0162 .signalservice.GroupContext.Type\022\014" +
"\n\004name\030\003 \001(\t\022\017\n\007members\030\004 \003(\t\0220\n\006avatar\030" +
"\005 \001(\0132 .signalservice.AttachmentPointer\022" +
- "\016\n\006admins\030\006 \003(\t\022\023\n\nnewMembers\030\346\007 \003(\t\022\027\n\016" +
- "removedMembers\030\347\007 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN" +
- "\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n" +
- "\014REQUEST_INFO\020\004\"\356\001\n\016ContactDetails\022\016\n\006nu",
- "mber\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\0224\n\006avatar\030\003 \001(\013" +
- "2$.signalservice.ContactDetails.Avatar\022\r" +
- "\n\005color\030\004 \001(\t\022\022\n\nprofileKey\030\006 \001(\014\022\017\n\007blo" +
- "cked\030\007 \001(\010\022\023\n\013expireTimer\030\010 \001(\r\022\020\n\010nickn" +
- "ame\030e \001(\t\032-\n\006Avatar\022\023\n\013contentType\030\001 \001(\t" +
- "\022\016\n\006length\030\002 \001(\r\"\367\001\n\014GroupDetails\022\n\n\002id\030" +
- "\001 \001(\014\022\014\n\004name\030\002 \001(\t\022\017\n\007members\030\003 \003(\t\0222\n\006" +
- "avatar\030\004 \001(\0132\".signalservice.GroupDetail" +
- "s.Avatar\022\024\n\006active\030\005 \001(\010:\004true\022\023\n\013expire" +
- "Timer\030\006 \001(\r\022\r\n\005color\030\007 \001(\t\022\017\n\007blocked\030\010 ",
- "\001(\010\022\016\n\006admins\030\t \003(\t\032-\n\006Avatar\022\023\n\013content" +
- "Type\030\001 \001(\t\022\016\n\006length\030\002 \001(\r\"\"\n\016PublicChat" +
- "Info\022\020\n\010serverID\030\001 \001(\004BB\n+org.session.li" +
- "bsignal.service.internal.pushB\023SignalSer" +
- "viceProtos"
+ "\016\n\006admins\030\006 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006" +
+ "UPDATE\020\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUE" +
+ "ST_INFO\020\004\"\356\001\n\016ContactDetails\022\016\n\006number\030\001" +
+ " \001(\t\022\014\n\004name\030\002 \001(\t\0224\n\006avatar\030\003 \001(\0132$.sig",
+ "nalservice.ContactDetails.Avatar\022\r\n\005colo" +
+ "r\030\004 \001(\t\022\022\n\nprofileKey\030\006 \001(\014\022\017\n\007blocked\030\007" +
+ " \001(\010\022\023\n\013expireTimer\030\010 \001(\r\022\020\n\010nickname\030e " +
+ "\001(\t\032-\n\006Avatar\022\023\n\013contentType\030\001 \001(\t\022\016\n\006le" +
+ "ngth\030\002 \001(\r\"\367\001\n\014GroupDetails\022\n\n\002id\030\001 \001(\014\022" +
+ "\014\n\004name\030\002 \001(\t\022\017\n\007members\030\003 \003(\t\0222\n\006avatar" +
+ "\030\004 \001(\0132\".signalservice.GroupDetails.Avat" +
+ "ar\022\024\n\006active\030\005 \001(\010:\004true\022\023\n\013expireTimer\030" +
+ "\006 \001(\r\022\r\n\005color\030\007 \001(\t\022\017\n\007blocked\030\010 \001(\010\022\016\n" +
+ "\006admins\030\t \003(\t\032-\n\006Avatar\022\023\n\013contentType\030\001",
+ " \001(\t\022\016\n\006length\030\002 \001(\r\"\"\n\016PublicChatInfo\022\020" +
+ "\n\010serverID\030\001 \001(\004BB\n+org.session.libsigna" +
+ "l.service.internal.pushB\023SignalServicePr" +
+ "otos"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -33642,7 +33169,7 @@ public final class SignalServiceProtos {
internal_static_signalservice_GroupContext_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_signalservice_GroupContext_descriptor,
- new java.lang.String[] { "Id", "Type", "Name", "Members", "Avatar", "Admins", "NewMembers", "RemovedMembers", });
+ new java.lang.String[] { "Id", "Type", "Name", "Members", "Avatar", "Admins", });
internal_static_signalservice_ContactDetails_descriptor =
getDescriptor().getMessageTypes().get(11);
internal_static_signalservice_ContactDetails_fieldAccessorTable = new