MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clarify `ProvisioningAddress` field naming

This commit is contained in:
Jon Chambers 2024-09-30 15:06:30 -04:00 committed by Jon Chambers
parent b2211de8d8
commit b284e95394
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/main/java/org/whispersystems/textsecuregcm/websocket/ProvisioningConnectListener.java
View File

@ -5,7 +5,6 @@
package org.whispersystems.textsecuregcm.websocket; package org.whispersystems.textsecuregcm.websocket;
import com.google.common.annotations.VisibleForTesting;
import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice; import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice;
import org.whispersystems.textsecuregcm.entities.MessageProtos; import org.whispersystems.textsecuregcm.entities.MessageProtos;
import org.whispersystems.textsecuregcm.entities.ProvisioningMessage; import org.whispersystems.textsecuregcm.entities.ProvisioningMessage;
@ -57,15 +56,15 @@ public class ProvisioningConnectListener implements WebSocketConnectListener {
}); });
context.getClient().sendRequest("PUT", "/v1/address", List.of(HeaderUtils.getTimestampHeader()), context.getClient().sendRequest("PUT", "/v1/address", List.of(HeaderUtils.getTimestampHeader()),
Optional.of(generateProvisioningUuid().toByteArray())); Optional.of(generateProvisioningAddress().toByteArray()));
} }
private static MessageProtos.ProvisioningUuid generateProvisioningUuid() { private static MessageProtos.ProvisioningAddress generateProvisioningAddress() {
final byte[] provisioningAddress = new byte[16]; final byte[] provisioningAddress = new byte[16];
new SecureRandom().nextBytes(provisioningAddress); new SecureRandom().nextBytes(provisioningAddress);
return MessageProtos.ProvisioningUuid.newBuilder() return MessageProtos.ProvisioningAddress.newBuilder()
.setUuid(Base64.getUrlEncoder().encodeToString(provisioningAddress)) .setAddress(Base64.getUrlEncoder().encodeToString(provisioningAddress))
.build(); .build();
} }
} }

4
service/src/main/proto/TextSecure.proto
View File

@ -38,8 +38,8 @@ message Envelope {
// next: 19 // next: 19
} }
message ProvisioningUuid { message ProvisioningAddress {
optional string uuid = 1; optional string address = 1;
} }
message ServerCertificate { message ServerCertificate {