From bf9582c97e58a293006e3ac8a0444238a7ee7b05 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 6 Nov 2018 09:58:45 -0800
Subject: [PATCH] Only set UNRESTRICTED mode if recipients have a non-null
 verifier.

Otherwise we could send UD messages to people with non-UD linked
devices.
---
 src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
index eb416a6dd8..1cff017f5e 100644
--- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
@@ -171,7 +171,7 @@ public class RetrieveProfileJob extends ContextJob implements InjectableType {
     RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
     byte[]            profileKey        = recipient.getProfileKey();
 
-    if (unrestrictedUnidentifiedAccess) {
+    if (unrestrictedUnidentifiedAccess && unidentifiedAccessVerifier != null) {
       Log.i(TAG, "Marking recipient UD status as unrestricted.");
       recipientDatabase.setUnidentifiedAccessMode(recipient, UnidentifiedAccessMode.UNRESTRICTED);
     } else if (profileKey == null || unidentifiedAccessVerifier == null) {