Support for group color sync

java/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceGroup.java

@@ -19,17 +19,20 @@ public class DeviceGroup {
   private final Optional<SignalServiceAttachmentStream> avatar;
   private final boolean                                 active;
   private final Optional<Integer>                       expirationTimer;
+  private final Optional<String>                        color;
 
   public DeviceGroup(byte[] id, Optional<String> name, List<String> members,
                      Optional<SignalServiceAttachmentStream> avatar,
-                     boolean active, Optional<Integer> expirationTimer)
+                     boolean active, Optional<Integer> expirationTimer,
+                     Optional<String> color)
   {
     this.id              = id;
     this.name            = name;
     this.members         = members;
     this.avatar          = avatar;
     this.active          = active;
     this.expirationTimer = expirationTimer;
+    this.color           = color;
   }
 
   public Optional<SignalServiceAttachmentStream> getAvatar() {
@@ -55,4 +58,8 @@ public boolean isActive() {
   public Optional<Integer> getExpirationTimer() {
     return expirationTimer;
   }
+
+  public Optional<String> getColor() {
+    return color;
+  }
 }

java/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceGroupsInputStream.java

@@ -38,6 +38,7 @@ public DeviceGroup read() throws IOException {
     Optional<SignalServiceAttachmentStream> avatar          = Optional.absent();
     boolean                                 active          = details.getActive();
     Optional<Integer>                       expirationTimer = Optional.absent();
+    Optional<String>                        color           = Optional.fromNullable(details.getColor());
 
     if (details.hasAvatar()) {
       long        avatarLength      = details.getAvatar().getLength();
@@ -51,7 +52,7 @@ public DeviceGroup read() throws IOException {
       expirationTimer = Optional.of(details.getExpireTimer());
     }
 
-    return new DeviceGroup(id, name, members, avatar, active, expirationTimer);
+    return new DeviceGroup(id, name, members, avatar, active, expirationTimer, color);
   }
 
 }

java/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceGroupsOutputStream.java

@@ -53,6 +53,10 @@ private void writeGroupDetails(DeviceGroup group) throws IOException {
       groupDetails.setExpireTimer(group.getExpirationTimer().get());
     }
 
+    if (group.getColor().isPresent()) {
+      groupDetails.setColor(group.getColor().get());
+    }
+
     groupDetails.addAllMembers(group.getMembers());
     groupDetails.setActive(group.isActive());
 

protobuf/SignalService.proto

@@ -307,4 +307,5 @@ message GroupDetails {
   optional Avatar avatar      = 4;
   optional bool   active      = 5 [default = true];
   optional uint32 expireTimer = 6;
+  optional string color       = 7;
 }