From 3816cb4bf41ef2ad89d8e52ed70c053548e43fa0 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 6 Nov 2018 16:24:37 -0500
Subject: [PATCH] Update proto schema to reflect album captions.

---
 SignalServiceKit/protobuf/SignalService.proto   |  1 +
 .../src/Protos/Generated/SSKProto.swift         | 17 +++++++++++++++++
 .../src/Protos/Generated/SignalService.pb.swift | 16 ++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto
index 39fabb2bd..c03cc861b 100644
--- a/SignalServiceKit/protobuf/SignalService.proto
+++ b/SignalServiceKit/protobuf/SignalService.proto
@@ -328,6 +328,7 @@ message AttachmentPointer {
   optional uint32  flags       = 8;
   optional uint32  width       = 9;
   optional uint32  height      = 10;
+  optional string  caption     = 11;
 }
 
 message GroupContext {
diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift
index e7a434434..7ceac4485 100644
--- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift
+++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift
@@ -4544,6 +4544,9 @@ extension SSKProtoSyncMessage.SSKProtoSyncMessageBuilder {
         if hasHeight {
             builder.setHeight(height)
         }
+        if let _value = caption {
+            builder.setCaption(_value)
+        }
         return builder
     }
 
@@ -4599,6 +4602,10 @@ extension SSKProtoSyncMessage.SSKProtoSyncMessageBuilder {
             proto.height = valueParam
         }
 
+        @objc public func setCaption(_ valueParam: String) {
+            proto.caption = valueParam
+        }
+
         @objc public func build() throws -> SSKProtoAttachmentPointer {
             return try SSKProtoAttachmentPointer.parseProto(proto)
         }
@@ -4690,6 +4697,16 @@ extension SSKProtoSyncMessage.SSKProtoSyncMessageBuilder {
         return proto.hasHeight
     }
 
+    @objc public var caption: String? {
+        guard proto.hasCaption else {
+            return nil
+        }
+        return proto.caption
+    }
+    @objc public var hasCaption: Bool {
+        return proto.hasCaption
+    }
+
     private init(proto: SignalServiceProtos_AttachmentPointer,
                  id: UInt64) {
         self.proto = proto
diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
index 8082ccb4c..7b8e5e894 100644
--- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
+++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
@@ -1860,6 +1860,15 @@ struct SignalServiceProtos_AttachmentPointer {
   /// Clears the value of `height`. Subsequent reads from it will return its default value.
   mutating func clearHeight() {self._height = nil}
 
+  var caption: String {
+    get {return _caption ?? String()}
+    set {_caption = newValue}
+  }
+  /// Returns true if `caption` has been explicitly set.
+  var hasCaption: Bool {return self._caption != nil}
+  /// Clears the value of `caption`. Subsequent reads from it will return its default value.
+  mutating func clearCaption() {self._caption = nil}
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   enum Flags: SwiftProtobuf.Enum {
@@ -1897,6 +1906,7 @@ struct SignalServiceProtos_AttachmentPointer {
   fileprivate var _flags: UInt32? = nil
   fileprivate var _width: UInt32? = nil
   fileprivate var _height: UInt32? = nil
+  fileprivate var _caption: String? = nil
 }
 
 #if swift(>=4.2)
@@ -4107,6 +4117,7 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro
     8: .same(proto: "flags"),
     9: .same(proto: "width"),
     10: .same(proto: "height"),
+    11: .same(proto: "caption"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -4122,6 +4133,7 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro
       case 8: try decoder.decodeSingularUInt32Field(value: &self._flags)
       case 9: try decoder.decodeSingularUInt32Field(value: &self._width)
       case 10: try decoder.decodeSingularUInt32Field(value: &self._height)
+      case 11: try decoder.decodeSingularStringField(value: &self._caption)
       default: break
       }
     }
@@ -4158,6 +4170,9 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro
     if let v = self._height {
       try visitor.visitSingularUInt32Field(value: v, fieldNumber: 10)
     }
+    if let v = self._caption {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 11)
+    }
     try unknownFields.traverse(visitor: &visitor)
   }
 
@@ -4172,6 +4187,7 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro
     if lhs._flags != rhs._flags {return false}
     if lhs._width != rhs._width {return false}
     if lhs._height != rhs._height {return false}
+    if lhs._caption != rhs._caption {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }