From a2b6dbda146f2c1e7ec951bbd0a27dc1f816eafd Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 15 Feb 2019 14:08:19 -0800
Subject: [PATCH] Correctly sync Note to Self conversation color.

---
 .../securesms/jobs/MultiDeviceContactUpdateJob.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
index 34a74c14f0..6fb7e6d488 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -199,11 +199,12 @@ public class MultiDeviceContactUpdateJob extends ContextJob implements Injectabl
       }
 
       if (ProfileKeyUtil.hasProfileKey(context)) {
+        Recipient self = Recipient.from(context, Address.fromSerialized(TextSecurePreferences.getLocalNumber(context)), false);
         out.write(new DeviceContact(TextSecurePreferences.getLocalNumber(context),
                                     Optional.absent(), Optional.absent(),
-                                    Optional.absent(), Optional.absent(),
+                                    Optional.of(self.getColor().serialize()), Optional.absent(),
                                     Optional.of(ProfileKeyUtil.getProfileKey(context)),
-                                    false, Optional.absent()));
+                                    false, self.getExpireMessages() > 0 ? Optional.of(self.getExpireMessages()) : Optional.absent()));
       }
 
       out.close();