From 5b91c927b67071b8066e6b1bb5359c3e72a753d1 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 14 Mar 2022 11:18:05 -0400
Subject: [PATCH] Refresh our own profile before rotating our profile key.

---
 .../thoughtcrime/securesms/recipients/RecipientUtil.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
index b806d414a2..ce0cea9309 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
@@ -21,6 +21,7 @@ import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
 import org.thoughtcrime.securesms.groups.GroupManager;
 import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceMessageRequestResponseJob;
+import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
 import org.thoughtcrime.securesms.jobs.RotateProfileKeyJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mms.OutgoingExpirationUpdateMessage;
@@ -160,8 +161,11 @@ public class RecipientUtil {
     SignalDatabase.recipients().setBlocked(recipient.getId(), true);
 
     if (recipient.isSystemContact() || recipient.isProfileSharing() || isProfileSharedViaGroup(context, recipient)) {
-      ApplicationDependencies.getJobManager().add(new RotateProfileKeyJob());
       SignalDatabase.recipients().setProfileSharing(recipient.getId(), false);
+
+      ApplicationDependencies.getJobManager().startChain(new RefreshOwnProfileJob())
+                                             .then(new RotateProfileKeyJob())
+                                             .enqueue();
     }
 
     ApplicationDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());