Include ACI and PNI in DeviceResponse
This commit is contained in:
parent
9c62622733
commit
e507ce2f26
|
@ -203,7 +203,7 @@ public class DeviceController {
|
||||||
device.setCreated(System.currentTimeMillis());
|
device.setCreated(System.currentTimeMillis());
|
||||||
device.setCapabilities(accountAttributes.getCapabilities());
|
device.setCapabilities(accountAttributes.getCapabilities());
|
||||||
|
|
||||||
accounts.update(account.get(), a -> {
|
final Account updatedAccount = accounts.update(account.get(), a -> {
|
||||||
device.setId(a.getNextDeviceId());
|
device.setId(a.getNextDeviceId());
|
||||||
messages.clear(a.getUuid(), device.getId());
|
messages.clear(a.getUuid(), device.getId());
|
||||||
a.addDevice(device);
|
a.addDevice(device);
|
||||||
|
@ -211,7 +211,7 @@ public class DeviceController {
|
||||||
|
|
||||||
pendingDevices.remove(number);
|
pendingDevices.remove(number);
|
||||||
|
|
||||||
return new DeviceResponse(device.getId());
|
return new DeviceResponse(updatedAccount.getUuid(), updatedAccount.getPhoneNumberIdentifier(), device.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Timed
|
@Timed
|
||||||
|
|
|
@ -8,7 +8,14 @@ package org.whispersystems.textsecuregcm.entities;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.google.common.annotations.VisibleForTesting;
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
public class DeviceResponse {
|
public class DeviceResponse {
|
||||||
|
@JsonProperty
|
||||||
|
private UUID uuid;
|
||||||
|
|
||||||
|
@JsonProperty
|
||||||
|
private UUID pni;
|
||||||
|
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private long deviceId;
|
private long deviceId;
|
||||||
|
@ -16,10 +23,20 @@ public class DeviceResponse {
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
public DeviceResponse() {}
|
public DeviceResponse() {}
|
||||||
|
|
||||||
public DeviceResponse(long deviceId) {
|
public DeviceResponse(UUID uuid, UUID pni, long deviceId) {
|
||||||
|
this.uuid = uuid;
|
||||||
|
this.pni = pni;
|
||||||
this.deviceId = deviceId;
|
this.deviceId = deviceId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public UUID getUuid() {
|
||||||
|
return uuid;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UUID getPni() {
|
||||||
|
return pni;
|
||||||
|
}
|
||||||
|
|
||||||
public long getDeviceId() {
|
public long getDeviceId() {
|
||||||
return deviceId;
|
return deviceId;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue