Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-03 23:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate the SyncMessage.pniIdentity field.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-05-10 18:01:01 -04:00
parent acb6510312
commit 6da36fe098
7 changed files with 2 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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;
}

7
libsignal/service/src/main/proto/SignalService.proto
View File

@@ -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;
}