Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-26 05:18:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed 'device key' to 'signed prekey'.

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-07-11 10:37:19 -07:00
parent 06f80c320d
commit b724ea8d3b
7 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
View File

@@ -19,8 +19,7 @@ package org.whispersystems.textsecuregcm.storage;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.whispersystems.textsecuregcm.auth.AuthenticationCredentials;
import org.whispersystems.textsecuregcm.entities.DeviceKey;
import org.whispersystems.textsecuregcm.entities.PreKeyV2;
import org.whispersystems.textsecuregcm.entities.SignedPreKey;
import org.whispersystems.textsecuregcm.util.Util;
import java.io.Serializable;
@@ -54,14 +53,14 @@ public class Device implements Serializable {
private int registrationId;
@JsonProperty
private DeviceKey deviceKey;
private SignedPreKey signedPreKey;
public Device() {}
public Device(long id, String authToken, String salt,
String signalingKey, String gcmId, String apnId,
boolean fetchesMessages, int registrationId,
DeviceKey deviceKey)
SignedPreKey signedPreKey)
{
this.id = id;
this.authToken = authToken;
@@ -71,7 +70,7 @@ public class Device implements Serializable {
this.apnId = apnId;
this.fetchesMessages = fetchesMessages;
this.registrationId = registrationId;
this.deviceKey = deviceKey;
this.signedPreKey = signedPreKey;
}
public String getApnId() {
@@ -139,11 +138,11 @@ public class Device implements Serializable {
this.registrationId = registrationId;
}
public DeviceKey getDeviceKey() {
return deviceKey;
public SignedPreKey getSignedPreKey() {
return signedPreKey;
}
public void setDeviceKey(DeviceKey deviceKey) {
this.deviceKey = deviceKey;
public void setSignedPreKey(SignedPreKey signedPreKey) {
this.signedPreKey = signedPreKey;
}
}