Ungate some PNP receive-side behavior.

app/src/main/java/org/thoughtcrime/securesms/database/PendingPniSignatureMessageTable.kt

@@ -8,7 +8,6 @@ import org.signal.core.util.logging.Log
 import org.signal.core.util.update
 import org.signal.core.util.withinTransaction
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.whispersystems.signalservice.api.messages.SendMessageResult
 
 /**
@@ -43,8 +42,6 @@ class PendingPniSignatureMessageTable(context: Context, databaseHelper: SignalDa
   }
 
   fun insertIfNecessary(recipientId: RecipientId, sentTimestamp: Long, result: SendMessageResult) {
-    if (!FeatureFlags.phoneNumberPrivacy()) return
-
     if (!result.isSuccess) {
       return
     }
@@ -63,8 +60,6 @@ class PendingPniSignatureMessageTable(context: Context, databaseHelper: SignalDa
   }
 
   fun acknowledgeReceipts(recipientId: RecipientId, sentTimestamps: Collection<Long>, deviceId: Int) {
-    if (!FeatureFlags.phoneNumberPrivacy()) return
-
     writableDatabase.withinTransaction { db ->
       val count = db
         .delete(TABLE_NAME)
@@ -93,7 +88,6 @@ class PendingPniSignatureMessageTable(context: Context, databaseHelper: SignalDa
    * Deletes all record of pending PNI verification messages. Should only be called after the user changes their number.
    */
   fun deleteAll() {
-    if (!FeatureFlags.phoneNumberPrivacy()) return
     writableDatabase.delete(TABLE_NAME).run()
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt

@@ -440,10 +440,6 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    * It is assumed that the tuple is verified. Do not give this method an untrusted association.
    */
   fun getAndPossiblyMergePnpVerified(aci: ACI?, pni: PNI?, e164: String?): RecipientId {
-    if (!FeatureFlags.phoneNumberPrivacy()) {
-      throw AssertionError()
-    }
-
     return getAndPossiblyMerge(aci = aci, pni = pni, e164 = e164, pniVerified = true, changeSelf = false)
   }
 

app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java

@@ -568,7 +568,7 @@ final class GroupManagerV2 {
 
       if (aciInPending.isPresent()) {
         return commitChangeWithConflictResolution(selfAci, groupOperations.createAcceptInviteChange(groupCandidate.requireExpiringProfileKeyCredential()));
-      } else if (pniInPending.isPresent() && FeatureFlags.phoneNumberPrivacy()) {
+      } else if (pniInPending.isPresent()) {
         return commitChangeWithConflictResolution(selfPni, groupOperations.createAcceptPniInviteChange(groupCandidate.requireExpiringProfileKeyCredential()));
       }
 

app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java

@@ -301,8 +301,8 @@ public class RetrieveProfileJob extends BaseJob {
     });
 
     recipientTable.markProfilesFetched(success, System.currentTimeMillis());
-    // XXX The service hasn't implemented profiles for PNIs yet, so if using PNP CDS we don't want to mark users without profiles as unregistered.
-    if ((operationState.unregistered.size() > 0 || newlyRegistered.size() > 0) && !FeatureFlags.phoneNumberPrivacy()) {
+
+    if (operationState.unregistered.size() > 0 || newlyRegistered.size() > 0) {
       Log.i(TAG, "Marking " + newlyRegistered.size() + " users as registered and " + operationState.unregistered.size() + " users as unregistered.");
       recipientTable.bulkUpdatedRegisteredStatus(newlyRegistered, operationState.unregistered);
     }

app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt

@@ -88,7 +88,17 @@ object MessageDecryptor {
     val selfAci: ACI = SignalStore.account().requireAci()
     val selfPni: PNI = SignalStore.account().requirePni()
 
-    val destination: ServiceId = envelope.getDestination(selfAci, selfPni)
+    val destination: ServiceId? = ServiceId.parseOrNull(envelope.destinationServiceId)
+
+    if (destination == null) {
+      Log.w(TAG, "${logPrefix(envelope)} Missing destination address! Invalid message, ignoring.")
+      return Result.Ignore(envelope, serverDeliveredTimestamp, emptyList())
+    }
+
+    if (destination != selfAci && destination != selfPni) {
+      Log.w(TAG, "${logPrefix(envelope)} Destination address does not match our ACI or PNI! Invalid message, ignoring.")
+      return Result.Ignore(envelope, serverDeliveredTimestamp, emptyList())
+    }
 
     if (destination == selfPni && envelope.hasSourceServiceId()) {
       Log.i(TAG, "${logPrefix(envelope)} Received a message at our PNI. Marking as needing a PNI signature.")
@@ -158,7 +168,7 @@ object MessageDecryptor {
         )
       }
 
-      if (FeatureFlags.phoneNumberPrivacy() && cipherResult.content.hasPniSignatureMessage()) {
+      if (cipherResult.content.hasPniSignatureMessage()) {
         if (cipherResult.metadata.sourceServiceId is ACI) {
           handlePniSignatureMessage(
             envelope,
@@ -411,23 +421,6 @@ object MessageDecryptor {
     }
   }
 
-  private fun Envelope.getDestination(selfAci: ServiceId, selfPni: ServiceId): ServiceId {
-    return if (!FeatureFlags.phoneNumberPrivacy()) {
-      selfAci
-    } else if (this.hasDestinationServiceId()) {
-      val serviceId = ServiceId.parseOrThrow(this.destinationServiceId)
-      if (serviceId == selfAci || serviceId == selfPni) {
-        serviceId
-      } else {
-        Log.w(TAG, "Destination of $serviceId does not match our ACI ($selfAci) or PNI ($selfPni)! Defaulting to ACI.")
-        selfAci
-      }
-    } else {
-      Log.w(TAG, "No destinationUuid set! Defaulting to ACI.")
-      selfAci
-    }
-  }
-
   private fun Int.toCiphertextMessageType(): Int {
     return when (this) {
       Envelope.Type.CIPHERTEXT_VALUE -> CiphertextMessage.WHISPER_TYPE

app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java

@@ -227,15 +227,8 @@ public class Recipient {
 
     RecipientTable db = SignalDatabase.recipients();
 
-    RecipientId recipientId;
-
-    if (FeatureFlags.phoneNumberPrivacy()) {
-      recipientId = db.getAndPossiblyMergePnpVerified(aci, pni, e164);
-    } else {
-      recipientId = db.getAndPossiblyMerge(aci, e164);
-    }
-
-    Recipient resolved = resolved(recipientId);
+    RecipientId recipientId = db.getAndPossiblyMergePnpVerified(aci, pni, e164);
+    Recipient   resolved    = resolved(recipientId);
 
     if (!resolved.getId().equals(recipientId)) {
       Log.w(TAG, "Resolved " + recipientId + ", but got back a recipient with " + resolved.getId());
@@ -1219,7 +1212,7 @@ public class Recipient {
   }
 
   public boolean needsPniSignature() {
-    return FeatureFlags.phoneNumberPrivacy() && needsPniSignature;
+    return needsPniSignature;
   }
 
   public boolean isCallLink() {