From 1ee747f3ef79933700b98d9508d29298e9425370 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Thu, 3 Sep 2020 12:28:38 -0300
Subject: [PATCH] Always share profile as part of unblocking.

---
 .../securesms/messagerequests/MessageRequestRepository.java  | 5 +----
 .../org/thoughtcrime/securesms/recipients/RecipientUtil.java | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
index 8f5dfa048a..9ee8995bb2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
@@ -212,12 +212,9 @@ final class MessageRequestRepository {
 
   void unblockAndAccept(@NonNull LiveRecipient liveRecipient, long threadId, @NonNull Runnable onMessageRequestUnblocked) {
     executor.execute(() -> {
-      Recipient         recipient         = liveRecipient.resolve();
-      RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+      Recipient recipient = liveRecipient.resolve();
 
       RecipientUtil.unblock(context, recipient);
-      recipientDatabase.setProfileSharing(liveRecipient.getId(), true);
-      liveRecipient.refresh();
 
       List<MessageDatabase.MarkedMessageInfo> messageIds = DatabaseFactory.getThreadDatabase(context)
                                                                           .setEntireThreadRead(threadId);
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 1baf640dd1..3ba9f7f6db 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
@@ -174,6 +174,7 @@ public class RecipientUtil {
     }
 
     DatabaseFactory.getRecipientDatabase(context).setBlocked(recipient.getId(), false);
+    DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient.getId(), true);
     ApplicationDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());
     StorageSyncHelper.scheduleSyncForDataChange();
     ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forAccept(recipient.getId()));