Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-06-29 02:26:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include group 'active' flag in device sync message.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2016-02-16 11:16:52 -08:00
parent 9de191f276
commit 83766433da
5 changed files with 106 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/src/main/java/org/whispersystems/textsecure/api/messages/multidevice/DeviceGroup.java
+10 -5
View File
@@ -11,12 +11,14 @@ public class DeviceGroup {
private final Optional<String> name;
private final List<String> members;
private final Optional<TextSecureAttachmentStream> avatar;
private final boolean active;
public DeviceGroup(byte[] id, Optional<String> name, List<String> members, Optional<TextSecureAttachmentStream> avatar) {
this.id = id;
this.name = name;
this.members = members;
this.avatar = avatar;
public DeviceGroup(byte[] id, Optional<String> name, List<String> members, Optional<TextSecureAttachmentStream> avatar, boolean active) {
this.id = id;
this.name = name;
this.members = members;
this.avatar = avatar;
this.active = active;
}
public Optional<TextSecureAttachmentStream> getAvatar() {
@@ -35,4 +37,7 @@ public class DeviceGroup {
return members;
}
public boolean isActive() {
return active;
}
}
java/src/main/java/org/whispersystems/textsecure/api/messages/multidevice/DeviceGroupsInputStream.java
+2 -1
View File
@@ -30,6 +30,7 @@ public class DeviceGroupsInputStream extends ChunkedInputStream{
Optional<String> name = Optional.fromNullable(details.getName());
List<String> members = details.getMembersList();
Optional<TextSecureAttachmentStream> avatar = Optional.absent();
boolean active = details.getActive();
if (details.hasAvatar()) {
long avatarLength = details.getAvatar().getLength();
@@ -39,7 +40,7 @@ public class DeviceGroupsInputStream extends ChunkedInputStream{
avatar = Optional.of(new TextSecureAttachmentStream(avatarStream, avatarContentType, avatarLength, null));
}
return new DeviceGroup(id, name, members, avatar);
return new DeviceGroup(id, name, members, avatar, active);
}
}
java/src/main/java/org/whispersystems/textsecure/api/messages/multidevice/DeviceGroupsOutputStream.java
+1
View File
@@ -44,6 +44,7 @@ public class DeviceGroupsOutputStream extends ChunkedOutputStream {
}
groupDetails.addAllMembers(group.getMembers());
groupDetails.setActive(group.isActive());
byte[] serializedContactDetails = groupDetails.build().toByteArray();
java/src/main/java/org/whispersystems/textsecure/internal/push/TextSecureProtos.java
+88 -6
View File
@@ -9798,6 +9798,16 @@ public final class TextSecureProtos {
* <code>optional .textsecure.GroupDetails.Avatar avatar = 4;</code>
*/
org.whispersystems.textsecure.internal.push.TextSecureProtos.GroupDetails.AvatarOrBuilder getAvatarOrBuilder();
// optional bool active = 5 [default = true];
/**
* <code>optional bool active = 5 [default = true];</code>
*/
boolean hasActive();
/**
* <code>optional bool active = 5 [default = true];</code>
*/
boolean getActive();
}
/**
* Protobuf type {@code textsecure.GroupDetails}
@@ -9881,6 +9891,11 @@ public final class TextSecureProtos {
bitField0_ |= 0x00000004;
break;
}
case 40: {
bitField0_ |= 0x00000008;
active_ = input.readBool();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -10587,11 +10602,28 @@ public final class TextSecureProtos {
return avatar_;
}
// optional bool active = 5 [default = true];
public static final int ACTIVE_FIELD_NUMBER = 5;
private boolean active_;
/**
* <code>optional bool active = 5 [default = true];</code>
*/
public boolean hasActive() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* <code>optional bool active = 5 [default = true];</code>
*/
public boolean getActive() {
return active_;
}
private void initFields() {
id_ = com.google.protobuf.ByteString.EMPTY;
name_ = "";
members_ = com.google.protobuf.LazyStringArrayList.EMPTY;
avatar_ = org.whispersystems.textsecure.internal.push.TextSecureProtos.GroupDetails.Avatar.getDefaultInstance();
active_ = true;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -10617,6 +10649,9 @@ public final class TextSecureProtos {
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(4, avatar_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeBool(5, active_);
}
getUnknownFields().writeTo(output);
}
@@ -10647,6 +10682,10 @@ public final class TextSecureProtos {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, avatar_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(5, active_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -10776,6 +10815,8 @@ public final class TextSecureProtos {
avatarBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000008);
active_ = true;
bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -10826,6 +10867,10 @@ public final class TextSecureProtos {
} else {
result.avatar_ = avatarBuilder_.build();
}
if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
to_bitField0_ |= 0x00000008;
}
result.active_ = active_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -10863,6 +10908,9 @@ public final class TextSecureProtos {
if (other.hasAvatar()) {
mergeAvatar(other.getAvatar());
}
if (other.hasActive()) {
setActive(other.getActive());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -11210,6 +11258,39 @@ public final class TextSecureProtos {
return avatarBuilder_;
}
// optional bool active = 5 [default = true];
private boolean active_ = true;
/**
* <code>optional bool active = 5 [default = true];</code>
*/
public boolean hasActive() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>optional bool active = 5 [default = true];</code>
*/
public boolean getActive() {
return active_;
}
/**
* <code>optional bool active = 5 [default = true];</code>
*/
public Builder setActive(boolean value) {
bitField0_ |= 0x00000010;
active_ = value;
onChanged();
return this;
}
/**
* <code>optional bool active = 5 [default = true];</code>
*/
public Builder clearActive() {
bitField0_ = (bitField0_ & ~0x00000010);
active_ = true;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:textsecure.GroupDetails)
}
@@ -11338,12 +11419,13 @@ public final class TextSecureProtos {
"\016\n\006number\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\0221\n\006avatar\030" +
"\003 \001(\0132!.textsecure.ContactDetails.Avatar" +
"\032-\n\006Avatar\022\023\n\013contentType\030\001 \001(\t\022\016\n\006lengt" +
"h\030\002 \001(\r\"\231\001\n\014GroupDetails\022\n\n\002id\030\001 \001(\014\022\014\n\004" +
"h\030\002 \001(\r\"\257\001\n\014GroupDetails\022\n\n\002id\030\001 \001(\014\022\014\n\004" +
"name\030\002 \001(\t\022\017\n\007members\030\003 \003(\t\022/\n\006avatar\030\004 ",
"\001(\0132\037.textsecure.GroupDetails.Avatar\032-\n\006" +
"Avatar\022\023\n\013contentType\030\001 \001(\t\022\016\n\006length\030\002 " +
"\001(\rB?\n+org.whispersystems.textsecure.int" +
"ernal.pushB\020TextSecureProtos"
"\001(\0132\037.textsecure.GroupDetails.Avatar\022\024\n\006" +
"active\030\005 \001(\010:\004true\032-\n\006Avatar\022\023\n\013contentT" +
"ype\030\001 \001(\t\022\016\n\006length\030\002 \001(\rB?\n+org.whisper" +
"systems.textsecure.internal.pushB\020TextSe" +
"cureProtos"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -11427,7 +11509,7 @@ public final class TextSecureProtos {
internal_static_textsecure_GroupDetails_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_textsecure_GroupDetails_descriptor,
new java.lang.String[] { "Id", "Name", "Members", "Avatar", });
new java.lang.String[] { "Id", "Name", "Members", "Avatar", "Active", });
internal_static_textsecure_GroupDetails_Avatar_descriptor =
internal_static_textsecure_GroupDetails_descriptor.getNestedTypes().get(0);
internal_static_textsecure_GroupDetails_Avatar_fieldAccessorTable = new