From 3fbf21a34ec0dda77da564b31d6012054cd43ed6 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sun, 29 Dec 2019 15:17:59 -0500
Subject: [PATCH] Don't crash on packs missing metadata.

---
 .../api/messages/SignalServiceStickerManifest.java          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java
index 419ea4cbaf..56e462787f 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java
@@ -14,9 +14,9 @@ public class SignalServiceStickerManifest {
   private final List<StickerInfo>     stickers;
 
   public SignalServiceStickerManifest(String title, String author, StickerInfo cover, List<StickerInfo> stickers) {
-    this.title    = Optional.of(title);
-    this.author   = Optional.of(author);
-    this.cover    = Optional.of(cover);
+    this.title    = Optional.fromNullable(title);
+    this.author   = Optional.fromNullable(author);
+    this.cover    = Optional.fromNullable(cover);
     this.stickers = (stickers == null) ? Collections.<StickerInfo>emptyList() : new ArrayList<>(stickers);
   }