Deprecate the SyncMessage.pniIdentity field.

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

@@ -139,7 +139,6 @@ public final class JobManagerFactories {
       put(MultiDeviceKeysUpdateJob.KEY,              new MultiDeviceKeysUpdateJob.Factory());
       put(MultiDeviceMessageRequestResponseJob.KEY,  new MultiDeviceMessageRequestResponseJob.Factory());
       put(MultiDeviceOutgoingPaymentSyncJob.KEY,     new MultiDeviceOutgoingPaymentSyncJob.Factory());
-      put(MultiDevicePniIdentityUpdateJob.KEY,       new MultiDevicePniIdentityUpdateJob.Factory());
       put(MultiDeviceProfileContentUpdateJob.KEY,    new MultiDeviceProfileContentUpdateJob.Factory());
       put(MultiDeviceProfileKeyUpdateJob.KEY,        new MultiDeviceProfileKeyUpdateJob.Factory());
       put(MultiDeviceReadUpdateJob.KEY,              new MultiDeviceReadUpdateJob.Factory());
@@ -281,6 +280,7 @@ public final class JobManagerFactories {
       put("RefreshPreKeysJob",                       new PreKeysSyncJob.Factory());
       put("RecipientChangedNumberJob",               new FailingJob.Factory());
       put("PushTextSendJob",                         new IndividualSendJob.Factory());
+      put("MultiDevicePniIdentityUpdateJob",         new FailingJob.Factory());
     }};
   }
 

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

@@ -1,104 +0,0 @@
-package org.thoughtcrime.securesms.jobs;
-
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.google.protobuf.ByteString;
-
-import org.signal.core.util.logging.Log;
-import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
-import org.thoughtcrime.securesms.jobmanager.Job;
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.net.NotPushRegisteredException;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
-import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
-import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos.SyncMessage.PniIdentity;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-/**
- * As part of the PNI migration, linked devices will need to be told what their PNI identity key is. This job is sent either in response to a request from
- * a linked device or as part of a migration when we start using PNIs.
- */
-public class MultiDevicePniIdentityUpdateJob extends BaseJob {
-
-  private static final String TAG = Log.tag(MultiDevicePniIdentityUpdateJob.class);
-
-  public static final String KEY = "MultiDevicePniIdentityUpdateJob";
-
-  public MultiDevicePniIdentityUpdateJob() {
-    this(new Parameters.Builder()
-                       .setQueue("__MULTI_DEVICE_PNI_IDENTITY_UPDATE_JOB__")
-                       .setMaxInstancesForFactory(1)
-                       .addConstraint(NetworkConstraint.KEY)
-                       .setLifespan(TimeUnit.DAYS.toMillis(1))
-                       .setMaxAttempts(Parameters.UNLIMITED)
-                       .build());
-  }
-
-  private MultiDevicePniIdentityUpdateJob(@NonNull Parameters parameters) {
-    super(parameters);
-  }
-
-  @Override
-  public @Nullable byte[] serialize() {
-    return null;
-  }
-
-  @Override
-  public @NonNull String getFactoryKey() {
-    return KEY;
-  }
-
-  @Override
-  public void onRun() throws IOException, UntrustedIdentityException {
-    if (!Recipient.self().isRegistered()) {
-      throw new NotPushRegisteredException();
-    }
-
-    if (!TextSecurePreferences.isMultiDevice(context)) {
-      Log.i(TAG, "Not multi device, aborting...");
-      return;
-    }
-
-    if (SignalStore.account().isLinkedDevice()) {
-      Log.i(TAG, "Not primary device, aborting...");
-      return;
-    }
-
-    IdentityKeyPair            pniIdentityKeyPair = SignalStore.account().getPniIdentityKey();
-    SignalServiceSyncMessage   syncMessage        = SignalServiceSyncMessage.forPniIdentity(PniIdentity.newBuilder()
-                                                                                                       .setPublicKey(ByteString.copyFrom(pniIdentityKeyPair.getPublicKey().serialize()))
-                                                                                                       .setPrivateKey(ByteString.copyFrom(pniIdentityKeyPair.getPrivateKey().serialize()))
-                                                                                                       .build());
-
-    ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(syncMessage, UnidentifiedAccessUtil.getAccessForSync(context));
-  }
-
-  @Override
-  public boolean onShouldRetry(@NonNull Exception e) {
-    if (e instanceof ServerRejectedException) return false;
-    return e instanceof PushNetworkException;
-  }
-
-  @Override
-  public void onFailure() {
-  }
-
-  public static final class Factory implements Job.Factory<MultiDevicePniIdentityUpdateJob> {
-    @Override
-    public @NonNull MultiDevicePniIdentityUpdateJob create(@NonNull Parameters parameters, @Nullable byte[] serializedData) {
-      return new MultiDevicePniIdentityUpdateJob(parameters);
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java

@@ -86,7 +86,6 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceContactSyncJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceGroupUpdateJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob;
-import org.thoughtcrime.securesms.jobs.MultiDevicePniIdentityUpdateJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceStickerPackSyncJob;
 import org.thoughtcrime.securesms.jobs.NullMessageSendJob;
 import org.thoughtcrime.securesms.jobs.PaymentLedgerUpdateJob;
@@ -1504,10 +1503,6 @@ public class MessageContentProcessor {
     if (message.isKeysRequest()) {
       ApplicationDependencies.getJobManager().add(new MultiDeviceKeysUpdateJob());
     }
-
-    if (message.isPniIdentityRequest()) {
-      ApplicationDependencies.getJobManager().add(new MultiDevicePniIdentityUpdateJob());
-    }
   }
 
   private void handleSynchronizeReadMessage(@NonNull SignalServiceContent content,

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

@@ -43,7 +43,6 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceContactSyncJob
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob
 import org.thoughtcrime.securesms.jobs.MultiDeviceGroupUpdateJob
 import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob
-import org.thoughtcrime.securesms.jobs.MultiDevicePniIdentityUpdateJob
 import org.thoughtcrime.securesms.jobs.MultiDeviceStickerPackSyncJob
 import org.thoughtcrime.securesms.jobs.PushProcessEarlyMessagesJob
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob
@@ -871,7 +870,6 @@ object SyncMessageProcessor {
         ApplicationDependencies.getJobManager().add(MultiDeviceStickerPackSyncJob())
       }
       Request.Type.KEYS -> ApplicationDependencies.getJobManager().add(MultiDeviceKeysUpdateJob())
-      Request.Type.PNI_IDENTITY -> ApplicationDependencies.getJobManager().add(MultiDevicePniIdentityUpdateJob())
       else -> warn(envelopeTimestamp, "Unknown request type: ${message.type}")
     }
   }

libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java

@@ -688,8 +688,6 @@ public class SignalServiceMessageSender {
     } else if (message.getRequest().isPresent()) {
       content = createRequestContent(message.getRequest().get().getRequest());
       urgent  = message.getRequest().get().isUrgent();
-    } else if (message.getPniIdentity().isPresent()) {
-      content = createPniIdentityContent(message.getPniIdentity().get());
     } else if (message.getCallEvent().isPresent()) {
       content = createCallEventContent(message.getCallEvent().get());
     } else {
@@ -1651,13 +1649,6 @@ public class SignalServiceMessageSender {
     return container.setSyncMessage(builder).build();
   }
 
-  private Content createPniIdentityContent(SyncMessage.PniIdentity proto) {
-    Content.Builder     container = Content.newBuilder();
-    SyncMessage.Builder builder   = createSyncMessageBuilder().setPniIdentity(proto);
-
-    return container.setSyncMessage(builder).build();
-  }
-
   private Content createCallEventContent(SyncMessage.CallEvent proto) {
     Content.Builder     container = Content.newBuilder();
     SyncMessage.Builder builder   = createSyncMessageBuilder().setCallEvent(proto);

libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SignalServiceSyncMessage.java

@@ -9,7 +9,6 @@ package org.whispersystems.signalservice.api.messages.multidevice;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos.SyncMessage.CallEvent;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos.SyncMessage.PniIdentity;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -33,7 +32,6 @@ public class SignalServiceSyncMessage {
   private final Optional<KeysMessage>                       keys;
   private final Optional<MessageRequestResponseMessage>     messageRequestResponse;
   private final Optional<OutgoingPaymentMessage>            outgoingPaymentMessage;
-  private final Optional<PniIdentity>                       pniIdentity;
   private final Optional<List<ViewedMessage>>               views;
   private final Optional<CallEvent>                         callEvent;
 
@@ -52,7 +50,6 @@ public class SignalServiceSyncMessage {
                                    Optional<MessageRequestResponseMessage> messageRequestResponse,
                                    Optional<OutgoingPaymentMessage> outgoingPaymentMessage,
                                    Optional<List<ViewedMessage>> views,
-                                   Optional<PniIdentity> pniIdentity,
                                    Optional<CallEvent> callEvent)
   {
     this.sent                   = sent;
@@ -70,7 +67,6 @@ public class SignalServiceSyncMessage {
     this.messageRequestResponse = messageRequestResponse;
     this.outgoingPaymentMessage = outgoingPaymentMessage;
     this.views                  = views;
-    this.pniIdentity            = pniIdentity;
     this.callEvent              = callEvent;
   }
 
@@ -90,7 +86,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -110,7 +105,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -130,7 +124,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -150,7 +143,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -170,7 +162,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -190,7 +181,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.of(views),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -210,7 +200,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -233,7 +222,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -253,7 +241,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -273,7 +260,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -293,7 +279,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -313,7 +298,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -333,7 +317,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -353,7 +336,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -373,7 +355,6 @@ public class SignalServiceSyncMessage {
                                         Optional.of(messageRequestResponse),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -393,27 +374,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.of(outgoingPaymentMessage),
                                         Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty());
-  }
-
-  public static SignalServiceSyncMessage forPniIdentity(PniIdentity pniIdentity) {
-    return new SignalServiceSyncMessage(Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.empty(),
-                                        Optional.of(pniIdentity),
                                         Optional.empty());
   }
 
@@ -433,7 +393,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.of(callEvent));
   }
 
@@ -453,7 +412,6 @@ public class SignalServiceSyncMessage {
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
-                                        Optional.empty(),
                                         Optional.empty());
   }
 
@@ -517,10 +475,6 @@ public class SignalServiceSyncMessage {
     return views;
   }
 
-  public Optional<PniIdentity> getPniIdentity() {
-    return pniIdentity;
-  }
-
   public Optional<CallEvent> getCallEvent() {
     return callEvent;
   }

libsignal/service/src/main/proto/SignalService.proto

@@ -556,11 +556,6 @@ message SyncMessage {
     optional bytes storageService = 1;
   }
 
-  message PniIdentity {
-    optional bytes publicKey  = 1;
-    optional bytes privateKey = 2;
-  }
-
   message MessageRequestResponse {
     enum Type {
       UNKNOWN          = 0;
@@ -650,7 +645,7 @@ message SyncMessage {
   optional MessageRequestResponse messageRequestResponse = 14;
   optional OutgoingPayment        outgoingPayment        = 15;
   repeated Viewed                 viewed                 = 16;
-  optional PniIdentity            pniIdentity            = 17;
+  reserved                      /*pniIdentity*/            17;
   optional PniChangeNumber        pniChangeNumber        = 18;
   optional CallEvent              callEvent              = 19;
 }