TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for multi-device provisioning flow.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-01-19 20:24:10 -08:00
parent 48f6c2c526
commit 0c32001fe4
22 changed files with 2668 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AndroidManifest.xml
View File

@ -94,6 +94,16 @@
android:theme="@style/TextSecure.Light.Dialog" android:theme="@style/TextSecure.Light.Dialog"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".DeviceProvisioningActivity"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="tsdevice"/>
</intent-filter>
</activity>
<activity android:name=".MmsPreferencesActivity" <activity android:name=".MmsPreferencesActivity"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

14
libtextsecure/protobuf/IncomingPushMessageSignal.proto
View File

@ -42,12 +42,18 @@ message PushMessageContent {
optional AttachmentPointer avatar = 5; optional AttachmentPointer avatar = 5;
} }
message SyncMessageContext {
optional string destination = 1;
optional uint64 timestamp = 2;
}
enum Flags { enum Flags {
END_SESSION = 1; END_SESSION = 1;
} }
optional string body = 1; optional string body = 1;
repeated AttachmentPointer attachments = 2; repeated AttachmentPointer attachments = 2;
optional GroupContext group = 3; optional GroupContext group = 3;
optional uint32 flags = 4; optional uint32 flags = 4;
optional SyncMessageContext sync = 5;
} }

2
libtextsecure/protobuf/Makefile
View File

@ -1,3 +1,3 @@
all: all:
protoc --java_out=../src/main/java/ IncomingPushMessageSignal.proto protoc --java_out=../src/main/java/ IncomingPushMessageSignal.proto Provisioning.proto

16
libtextsecure/protobuf/Provisioning.proto Normal file
View File

@ -0,0 +1,16 @@
package textsecure;
option java_package = "org.whispersystems.textsecure.internal.push";
option java_outer_classname = "ProvisioningProtos";
message ProvisionEnvelope {
optional bytes publicKey = 1;
optional bytes body = 2; // Encrypted ProvisionMessage
}
message ProvisionMessage {
optional bytes identityKeyPublic = 1;
optional bytes identityKeyPrivate = 2;
optional string number = 3;
optional string provisioningCode = 4;
}

38
libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java
View File

@ -16,29 +16,37 @@
*/ */
package org.whispersystems.textsecure.api; package org.whispersystems.textsecure.api;
import com.google.protobuf.ByteString;
import org.whispersystems.libaxolotl.IdentityKey; import org.whispersystems.libaxolotl.IdentityKey;
import org.whispersystems.libaxolotl.IdentityKeyPair;
import org.whispersystems.libaxolotl.InvalidKeyException;
import org.whispersystems.libaxolotl.ecc.ECPublicKey;
import org.whispersystems.libaxolotl.state.PreKeyRecord; import org.whispersystems.libaxolotl.state.PreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord; import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.util.guava.Optional; import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.push.ContactTokenDetails; import org.whispersystems.textsecure.api.push.ContactTokenDetails;
import org.whispersystems.textsecure.api.push.TrustStore;
import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
import org.whispersystems.textsecure.internal.push.PushServiceSocket;
import org.whispersystems.textsecure.api.push.SignedPreKeyEntity; import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
import org.whispersystems.textsecure.api.push.TrustStore;
import org.whispersystems.textsecure.internal.crypto.ProvisioningCipher;
import org.whispersystems.textsecure.internal.push.PushServiceSocket;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import static org.whispersystems.textsecure.internal.push.ProvisioningProtos.ProvisionMessage;
public class TextSecureAccountManager { public class TextSecureAccountManager {
private final PushServiceSocket pushServiceSocket; private final PushServiceSocket pushServiceSocket;
private final String user;
public TextSecureAccountManager(String url, TrustStore trustStore, public TextSecureAccountManager(String url, TrustStore trustStore,
String user, String password) String user, String password)
{ {
this.pushServiceSocket = new PushServiceSocket(url, trustStore, user, password); this.pushServiceSocket = new PushServiceSocket(url, trustStore, user, password);
this.user = user;
} }
public void setGcmId(Optional<String> gcmRegistrationId) throws IOException { public void setGcmId(Optional<String> gcmRegistrationId) throws IOException {
@ -94,4 +102,26 @@ public class TextSecureAccountManager {
return this.pushServiceSocket.retrieveDirectory(contactTokens); return this.pushServiceSocket.retrieveDirectory(contactTokens);
} }
public String getNewDeviceVerificationCode() throws IOException {
return this.pushServiceSocket.getNewDeviceVerificationCode();
}
public void addDevice(String deviceIdentifier,
ECPublicKey deviceKey,
IdentityKeyPair identityKeyPair,
String code)
throws InvalidKeyException, IOException
{
ProvisioningCipher cipher = new ProvisioningCipher(deviceKey);
ProvisionMessage message = ProvisionMessage.newBuilder()
.setIdentityKeyPublic(ByteString.copyFrom(identityKeyPair.getPublicKey().serialize()))
.setIdentityKeyPrivate(ByteString.copyFrom(identityKeyPair.getPrivateKey().serialize()))
.setNumber(user)
.setProvisioningCode(code)
.build();
byte[] ciphertext = cipher.encrypt(message);
this.pushServiceSocket.sendProvisioningMessage(deviceIdentifier, ciphertext);
}
} }

69
libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java
View File

@ -19,6 +19,7 @@ package org.whispersystems.textsecure.api;
import android.util.Log; import android.util.Log;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import com.google.protobuf.InvalidProtocolBufferException;
import org.whispersystems.libaxolotl.InvalidKeyException; import org.whispersystems.libaxolotl.InvalidKeyException;
import org.whispersystems.libaxolotl.SessionBuilder; import org.whispersystems.libaxolotl.SessionBuilder;
@ -40,6 +41,7 @@ import org.whispersystems.textsecure.internal.push.OutgoingPushMessageList;
import org.whispersystems.textsecure.internal.push.PushAttachmentData; import org.whispersystems.textsecure.internal.push.PushAttachmentData;
import org.whispersystems.textsecure.internal.push.PushBody; import org.whispersystems.textsecure.internal.push.PushBody;
import org.whispersystems.textsecure.internal.push.PushServiceSocket; import org.whispersystems.textsecure.internal.push.PushServiceSocket;
import org.whispersystems.textsecure.internal.push.SendMessageResponse;
import org.whispersystems.textsecure.internal.push.StaleDevices; import org.whispersystems.textsecure.internal.push.StaleDevices;
import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException; import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions; import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
@ -62,14 +64,17 @@ public class TextSecureMessageSender {
private final PushServiceSocket socket; private final PushServiceSocket socket;
private final AxolotlStore store; private final AxolotlStore store;
private final PushAddress syncAddress;
private final Optional<EventListener> eventListener; private final Optional<EventListener> eventListener;
public TextSecureMessageSender(String url, TrustStore trustStore, public TextSecureMessageSender(String url, TrustStore trustStore,
String user, String password, AxolotlStore store, String user, String password,
long userId, AxolotlStore store,
Optional<EventListener> eventListener) Optional<EventListener> eventListener)
{ {
this.socket = new PushServiceSocket(url, trustStore, user, password); this.socket = new PushServiceSocket(url, trustStore, user, password);
this.store = store; this.store = store;
this.syncAddress = new PushAddress(userId, user, null);
this.eventListener = eventListener; this.eventListener = eventListener;
} }
@ -80,8 +85,14 @@ public class TextSecureMessageSender {
public void sendMessage(PushAddress recipient, TextSecureMessage message) public void sendMessage(PushAddress recipient, TextSecureMessage message)
throws UntrustedIdentityException, IOException throws UntrustedIdentityException, IOException
{ {
byte[] content = createMessageContent(message); byte[] content = createMessageContent(message);
sendMessage(recipient, message.getTimestamp(), content); long timestamp = message.getTimestamp();
SendMessageResponse response = sendMessage(recipient, timestamp, content);
if (response != null && response.getNeedsSync()) {
byte[] syncMessage = createSyncMessageContent(content, recipient, timestamp);
sendMessage(syncAddress, timestamp, syncMessage);
}
if (message.isEndSession()) { if (message.isEndSession()) {
store.deleteAllSessions(recipient.getRecipientId()); store.deleteAllSessions(recipient.getRecipientId());
@ -122,6 +133,20 @@ public class TextSecureMessageSender {
return builder.build().toByteArray(); return builder.build().toByteArray();
} }
private byte[] createSyncMessageContent(byte[] content, PushAddress recipient, long timestamp) {
try {
PushMessageContent.Builder builder = PushMessageContent.parseFrom(content).toBuilder();
builder.setSync(PushMessageContent.SyncMessageContext.newBuilder()
.setDestination(recipient.getNumber())
.setTimestamp(timestamp)
.build());
return builder.build().toByteArray();
} catch (InvalidProtocolBufferException e) {
throw new AssertionError(e);
}
}
private GroupContext createGroupContent(TextSecureGroup group) throws IOException { private GroupContext createGroupContent(TextSecureGroup group) throws IOException {
GroupContext.Builder builder = GroupContext.newBuilder(); GroupContext.Builder builder = GroupContext.newBuilder();
builder.setId(ByteString.copyFrom(group.getGroupId())); builder.setId(ByteString.copyFrom(group.getGroupId()));
@ -168,15 +193,13 @@ public class TextSecureMessageSender {
} }
} }
private void sendMessage(PushAddress recipient, long timestamp, byte[] content) private SendMessageResponse sendMessage(PushAddress recipient, long timestamp, byte[] content)
throws UntrustedIdentityException, IOException throws UntrustedIdentityException, IOException
{ {
for (int i=0;i<3;i++) { for (int i=0;i<3;i++) {
try { try {
OutgoingPushMessageList messages = getEncryptedMessages(socket, recipient, timestamp, content); OutgoingPushMessageList messages = getEncryptedMessages(socket, recipient, timestamp, content);
socket.sendMessage(messages); return socket.sendMessage(messages);
return;
} catch (MismatchedDevicesException mde) { } catch (MismatchedDevicesException mde) {
Log.w(TAG, mde); Log.w(TAG, mde);
handleMismatchedDevices(socket, recipient, mde.getMismatchedDevices()); handleMismatchedDevices(socket, recipient, mde.getMismatchedDevices());
@ -185,6 +208,8 @@ public class TextSecureMessageSender {
handleStaleDevices(recipient, ste.getStaleDevices()); handleStaleDevices(recipient, ste.getStaleDevices());
} }
} }
throw new IOException("Failed to resolve conflicts after 3 attempts!");
} }
private List<AttachmentPointer> createAttachmentPointers(Optional<List<TextSecureAttachment>> attachments) throws IOException { private List<AttachmentPointer> createAttachmentPointers(Optional<List<TextSecureAttachment>> attachments) throws IOException {
@ -230,31 +255,31 @@ public class TextSecureMessageSender {
byte[] plaintext) byte[] plaintext)
throws IOException, UntrustedIdentityException throws IOException, UntrustedIdentityException
{ {
PushBody masterBody = getEncryptedMessage(socket, recipient, plaintext);
List<OutgoingPushMessage> messages = new LinkedList<>(); List<OutgoingPushMessage> messages = new LinkedList<>();
messages.add(new OutgoingPushMessage(recipient, masterBody));
if (!recipient.equals(syncAddress)) {
PushBody masterBody = getEncryptedMessage(socket, recipient, PushAddress.DEFAULT_DEVICE_ID, plaintext);
messages.add(new OutgoingPushMessage(recipient, PushAddress.DEFAULT_DEVICE_ID, masterBody));
}
for (int deviceId : store.getSubDeviceSessions(recipient.getRecipientId())) { for (int deviceId : store.getSubDeviceSessions(recipient.getRecipientId())) {
PushAddress device = new PushAddress(recipient.getRecipientId(), recipient.getNumber(), deviceId, recipient.getRelay()); PushBody body = getEncryptedMessage(socket, recipient, deviceId, plaintext);
PushBody body = getEncryptedMessage(socket, device, plaintext); messages.add(new OutgoingPushMessage(recipient, deviceId, body));
messages.add(new OutgoingPushMessage(device, body));
} }
return new OutgoingPushMessageList(recipient.getNumber(), timestamp, recipient.getRelay(), messages); return new OutgoingPushMessageList(recipient.getNumber(), timestamp, recipient.getRelay(), messages);
} }
private PushBody getEncryptedMessage(PushServiceSocket socket, PushAddress recipient, byte[] plaintext) private PushBody getEncryptedMessage(PushServiceSocket socket, PushAddress recipient, int deviceId, byte[] plaintext)
throws IOException, UntrustedIdentityException throws IOException, UntrustedIdentityException
{ {
if (!store.containsSession(recipient.getRecipientId(), recipient.getDeviceId())) { if (!store.containsSession(recipient.getRecipientId(), deviceId)) {
try { try {
List<PreKeyBundle> preKeys = socket.getPreKeys(recipient); List<PreKeyBundle> preKeys = socket.getPreKeys(recipient, deviceId);
for (PreKeyBundle preKey : preKeys) { for (PreKeyBundle preKey : preKeys) {
try { try {
SessionBuilder sessionBuilder = new SessionBuilder(store, recipient.getRecipientId(), recipient.getDeviceId()); SessionBuilder sessionBuilder = new SessionBuilder(store, recipient.getRecipientId(), deviceId);
sessionBuilder.process(preKey); sessionBuilder.process(preKey);
} catch (org.whispersystems.libaxolotl.UntrustedIdentityException e) { } catch (org.whispersystems.libaxolotl.UntrustedIdentityException e) {
throw new UntrustedIdentityException("Untrusted identity key!", recipient.getNumber(), preKey.getIdentityKey()); throw new UntrustedIdentityException("Untrusted identity key!", recipient.getNumber(), preKey.getIdentityKey());
@ -269,7 +294,7 @@ public class TextSecureMessageSender {
} }
} }
TextSecureCipher cipher = new TextSecureCipher(store, recipient.getRecipientId(), recipient.getDeviceId()); TextSecureCipher cipher = new TextSecureCipher(store, recipient.getRecipientId(), deviceId);
CiphertextMessage message = cipher.encrypt(plaintext); CiphertextMessage message = cipher.encrypt(plaintext);
int remoteRegistrationId = cipher.getRemoteRegistrationId(); int remoteRegistrationId = cipher.getRemoteRegistrationId();
@ -292,12 +317,10 @@ public class TextSecureMessageSender {
} }
for (int missingDeviceId : mismatchedDevices.getMissingDevices()) { for (int missingDeviceId : mismatchedDevices.getMissingDevices()) {
PushAddress device = new PushAddress(recipient.getRecipientId(), recipient.getNumber(), PreKeyBundle preKey = socket.getPreKey(recipient, missingDeviceId);
missingDeviceId, recipient.getRelay());
PreKeyBundle preKey = socket.getPreKey(device);
try { try {
SessionBuilder sessionBuilder = new SessionBuilder(store, device.getRecipientId(), device.getDeviceId()); SessionBuilder sessionBuilder = new SessionBuilder(store, recipient.getRecipientId(), missingDeviceId);
sessionBuilder.process(preKey); sessionBuilder.process(preKey);
} catch (org.whispersystems.libaxolotl.UntrustedIdentityException e) { } catch (org.whispersystems.libaxolotl.UntrustedIdentityException e) {
throw new UntrustedIdentityException("Untrusted identity key!", recipient.getNumber(), preKey.getIdentityKey()); throw new UntrustedIdentityException("Untrusted identity key!", recipient.getNumber(), preKey.getIdentityKey());

30
libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/PushAddress.java
View File

@ -22,13 +22,11 @@ public class PushAddress {
private final long recipientId; private final long recipientId;
private final String e164number; private final String e164number;
private final int deviceId;
private final String relay; private final String relay;
public PushAddress(long recipientId, String e164number, int deviceId, String relay) { public PushAddress(long recipientId, String e164number, String relay) {
this.recipientId = recipientId; this.recipientId = recipientId;
this.e164number = e164number; this.e164number = e164number;
this.deviceId = deviceId;
this.relay = relay; this.relay = relay;
} }
@ -44,7 +42,29 @@ public class PushAddress {
return recipientId; return recipientId;
} }
public int getDeviceId() { @Override
return deviceId; public boolean equals(Object other) {
if (other == null || !(other instanceof PushAddress)) return false;
PushAddress that = (PushAddress)other;
return this.recipientId == that.recipientId &&
equals(this.e164number, that.e164number) &&
equals(this.relay, that.relay);
}
@Override
public int hashCode() {
int hashCode = (int)this.recipientId;
if (this.e164number != null) hashCode ^= this.e164number.hashCode();
if (this.relay != null) hashCode ^= this.relay.hashCode();
return hashCode;
}
private boolean equals(String one, String two) {
if (one == null) return two == null;
return one.equals(two);
} }
} }

75
libtextsecure/src/main/java/org/whispersystems/textsecure/internal/crypto/ProvisioningCipher.java Normal file
View File

@ -0,0 +1,75 @@
package org.whispersystems.textsecure.internal.crypto;
import com.google.protobuf.ByteString;
import org.whispersystems.libaxolotl.InvalidKeyException;
import org.whispersystems.libaxolotl.ecc.Curve;
import org.whispersystems.libaxolotl.ecc.ECKeyPair;
import org.whispersystems.libaxolotl.ecc.ECPublicKey;
import org.whispersystems.libaxolotl.kdf.HKDFv3;
import org.whispersystems.textsecure.internal.util.Util;
import java.security.NoSuchAlgorithmException;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.Mac;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.SecretKeySpec;
import static org.whispersystems.textsecure.internal.push.ProvisioningProtos.ProvisionEnvelope;
import static org.whispersystems.textsecure.internal.push.ProvisioningProtos.ProvisionMessage;
public class ProvisioningCipher {
private static final String TAG = ProvisioningCipher.class.getSimpleName();
private final ECPublicKey theirPublicKey;
public ProvisioningCipher(ECPublicKey theirPublicKey) {
this.theirPublicKey = theirPublicKey;
}
public byte[] encrypt(ProvisionMessage message) throws InvalidKeyException {
ECKeyPair ourKeyPair = Curve.generateKeyPair();
byte[] sharedSecret = Curve.calculateAgreement(theirPublicKey, ourKeyPair.getPrivateKey());
byte[] derivedSecret = new HKDFv3().deriveSecrets(sharedSecret, "TextSecure Provisioning Message".getBytes(), 64);
byte[][] parts = Util.split(derivedSecret, 32, 32);
byte[] version = {0x01};
byte[] ciphertext = getCiphertext(parts[0], message.toByteArray());
byte[] mac = getMac(parts[1], Util.join(version, ciphertext));
byte[] body = Util.join(version, ciphertext, mac);
return ProvisionEnvelope.newBuilder()
.setPublicKey(ByteString.copyFrom(ourKeyPair.getPublicKey().serialize()))
.setBody(ByteString.copyFrom(body))
.build()
.toByteArray();
}
private byte[] getCiphertext(byte[] key, byte[] message) {
try {
Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, "AES"));
return Util.join(cipher.getIV(), cipher.doFinal(message));
} catch (NoSuchAlgorithmException | NoSuchPaddingException | java.security.InvalidKeyException | IllegalBlockSizeException | BadPaddingException e) {
throw new AssertionError(e);
}
}
private byte[] getMac(byte[] key, byte[] message) {
try {
Mac mac = Mac.getInstance("HmacSHA256");
mac.init(new SecretKeySpec(key, "HmacSHA256"));
return mac.doFinal(message);
} catch (NoSuchAlgorithmException | java.security.InvalidKeyException e) {
throw new AssertionError(e);
}
}
}

10
libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/DeviceCode.java Normal file
View File

@ -0,0 +1,10 @@
package org.whispersystems.textsecure.internal.push;
public class DeviceCode {
private String verificationCode;
public String getVerificationCode() {
return verificationCode;
}
}

4
libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java
View File

@ -27,9 +27,9 @@ public class OutgoingPushMessage {
private int destinationRegistrationId; private int destinationRegistrationId;
private String body; private String body;
public OutgoingPushMessage(PushAddress address, PushBody body) { public OutgoingPushMessage(PushAddress address, int deviceId, PushBody body) {
this.type = body.getType(); this.type = body.getType();
this.destinationDeviceId = address.getDeviceId(); this.destinationDeviceId = deviceId;
this.destinationRegistrationId = body.getRemoteRegistrationId(); this.destinationRegistrationId = body.getRemoteRegistrationId();
this.body = Base64.encodeBytes(body.getBody()); this.body = Base64.encodeBytes(body.getBody());
} }

11
libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningMessage.java Normal file
View File

@ -0,0 +1,11 @@
package org.whispersystems.textsecure.internal.push;
public class ProvisioningMessage {
private String body;
public ProvisioningMessage(String body) {
this.body = body;
}
}

1375
libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningProtos.java Normal file
View File

File diff suppressed because it is too large Load Diff

804
libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java
View File

@ -244,6 +244,10 @@ public final class PushMessageProtos {
* <code>RECEIPT = 5;</code> * <code>RECEIPT = 5;</code>
*/ */
RECEIPT(5, 5), RECEIPT(5, 5),
/**
* <code>COPY = 6;</code>
*/
COPY(6, 6),
; ;
/** /**
@ -270,6 +274,10 @@ public final class PushMessageProtos {
* <code>RECEIPT = 5;</code> * <code>RECEIPT = 5;</code>
*/ */
public static final int RECEIPT_VALUE = 5; public static final int RECEIPT_VALUE = 5;
/**
* <code>COPY = 6;</code>
*/
public static final int COPY_VALUE = 6;
public final int getNumber() { return value; } public final int getNumber() { return value; }
@ -282,6 +290,7 @@ public final class PushMessageProtos {
case 3: return PREKEY_BUNDLE; case 3: return PREKEY_BUNDLE;
case 4: return PLAINTEXT; case 4: return PLAINTEXT;
case 5: return RECEIPT; case 5: return RECEIPT;
case 6: return COPY;
default: return null; default: return null;
} }
} }
@ -1187,6 +1196,20 @@ public final class PushMessageProtos {
* <code>optional uint32 flags = 4;</code> * <code>optional uint32 flags = 4;</code>
*/ */
int getFlags(); int getFlags();
// optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
boolean hasSync();
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext getSync();
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContextOrBuilder getSyncOrBuilder();
} }
/** /**
* Protobuf type {@code textsecure.PushMessageContent} * Protobuf type {@code textsecure.PushMessageContent}
@ -1270,6 +1293,19 @@ public final class PushMessageProtos {
flags_ = input.readUInt32(); flags_ = input.readUInt32();
break; break;
} }
case 42: {
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.Builder subBuilder = null;
if (((bitField0_ & 0x00000008) == 0x00000008)) {
subBuilder = sync_.toBuilder();
}
sync_ = input.readMessage(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(sync_);
sync_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000008;
break;
}
} }
} }
} catch (com.google.protobuf.InvalidProtocolBufferException e) { } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -3143,6 +3179,558 @@ public final class PushMessageProtos {
// @@protoc_insertion_point(class_scope:textsecure.PushMessageContent.GroupContext) // @@protoc_insertion_point(class_scope:textsecure.PushMessageContent.GroupContext)
} }
public interface SyncMessageContextOrBuilder
extends com.google.protobuf.MessageOrBuilder {
// optional string destination = 1;
/**
* <code>optional string destination = 1;</code>
*/
boolean hasDestination();
/**
* <code>optional string destination = 1;</code>
*/
java.lang.String getDestination();
/**
* <code>optional string destination = 1;</code>
*/
com.google.protobuf.ByteString
getDestinationBytes();
// optional uint64 timestamp = 2;
/**
* <code>optional uint64 timestamp = 2;</code>
*/
boolean hasTimestamp();
/**
* <code>optional uint64 timestamp = 2;</code>
*/
long getTimestamp();
}
/**
* Protobuf type {@code textsecure.PushMessageContent.SyncMessageContext}
*/
public static final class SyncMessageContext extends
com.google.protobuf.GeneratedMessage
implements SyncMessageContextOrBuilder {
// Use SyncMessageContext.newBuilder() to construct.
private SyncMessageContext(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
private SyncMessageContext(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final SyncMessageContext defaultInstance;
public static SyncMessageContext getDefaultInstance() {
return defaultInstance;
}
public SyncMessageContext getDefaultInstanceForType() {
return defaultInstance;
}
private final com.google.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private SyncMessageContext(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
int tag = input.readTag();
switch (tag) {
case 0:
done = true;
break;
default: {
if (!parseUnknownField(input, unknownFields,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
bitField0_ |= 0x00000001;
destination_ = input.readBytes();
break;
}
case 16: {
bitField0_ |= 0x00000002;
timestamp_ = input.readUInt64();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_SyncMessageContext_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_SyncMessageContext_fieldAccessorTable
.ensureFieldAccessorsInitialized(
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.Builder.class);
}
public static com.google.protobuf.Parser<SyncMessageContext> PARSER =
new com.google.protobuf.AbstractParser<SyncMessageContext>() {
public SyncMessageContext parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new SyncMessageContext(input, extensionRegistry);
}
};
@java.lang.Override
public com.google.protobuf.Parser<SyncMessageContext> getParserForType() {
return PARSER;
}
private int bitField0_;
// optional string destination = 1;
public static final int DESTINATION_FIELD_NUMBER = 1;
private java.lang.Object destination_;
/**
* <code>optional string destination = 1;</code>
*/
public boolean hasDestination() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional string destination = 1;</code>
*/
public java.lang.String getDestination() {
java.lang.Object ref = destination_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
destination_ = s;
}
return s;
}
}
/**
* <code>optional string destination = 1;</code>
*/
public com.google.protobuf.ByteString
getDestinationBytes() {
java.lang.Object ref = destination_;
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
destination_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
// optional uint64 timestamp = 2;
public static final int TIMESTAMP_FIELD_NUMBER = 2;
private long timestamp_;
/**
* <code>optional uint64 timestamp = 2;</code>
*/
public boolean hasTimestamp() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional uint64 timestamp = 2;</code>
*/
public long getTimestamp() {
return timestamp_;
}
private void initFields() {
destination_ = "";
timestamp_ = 0L;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1;
memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, getDestinationBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeUInt64(2, timestamp_);
}
getUnknownFields().writeTo(output);
}
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(1, getDestinationBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(2, timestamp_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
protected java.lang.Object writeReplace()
throws java.io.ObjectStreamException {
return super.writeReplace();
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@java.lang.Override
protected Builder newBuilderForType(
com.google.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
/**
* Protobuf type {@code textsecure.PushMessageContent.SyncMessageContext}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder>
implements org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContextOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_SyncMessageContext_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_SyncMessageContext_fieldAccessorTable
.ensureFieldAccessorsInitialized(
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.Builder.class);
}
// Construct using org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
private Builder(
com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
return new Builder();
}
public Builder clear() {
super.clear();
destination_ = "";
bitField0_ = (bitField0_ & ~0x00000001);
timestamp_ = 0L;
bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_SyncMessageContext_descriptor;
}
public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext getDefaultInstanceForType() {
return org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.getDefaultInstance();
}
public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext build() {
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext buildPartial() {
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext result = new org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001;
}
result.destination_ = destination_;
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002;
}
result.timestamp_ = timestamp_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext) {
return mergeFrom((org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext)other);
} else {
super.mergeFrom(other);
return this;
}
}
public Builder mergeFrom(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext other) {
if (other == org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.getDefaultInstance()) return this;
if (other.hasDestination()) {
bitField0_ |= 0x00000001;
destination_ = other.destination_;
onChanged();
}
if (other.hasTimestamp()) {
setTimestamp(other.getTimestamp());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
public final boolean isInitialized() {
return true;
}
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
mergeFrom(parsedMessage);
}
}
return this;
}
private int bitField0_;
// optional string destination = 1;
private java.lang.Object destination_ = "";
/**
* <code>optional string destination = 1;</code>
*/
public boolean hasDestination() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional string destination = 1;</code>
*/
public java.lang.String getDestination() {
java.lang.Object ref = destination_;
if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((com.google.protobuf.ByteString) ref)
.toStringUtf8();
destination_ = s;
return s;
} else {
return (java.lang.String) ref;
}
}
/**
* <code>optional string destination = 1;</code>
*/
public com.google.protobuf.ByteString
getDestinationBytes() {
java.lang.Object ref = destination_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
destination_ = b;
return b;
} else {
return (com.google.protobuf.ByteString) ref;
}
}
/**
* <code>optional string destination = 1;</code>
*/
public Builder setDestination(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
destination_ = value;
onChanged();
return this;
}
/**
* <code>optional string destination = 1;</code>
*/
public Builder clearDestination() {
bitField0_ = (bitField0_ & ~0x00000001);
destination_ = getDefaultInstance().getDestination();
onChanged();
return this;
}
/**
* <code>optional string destination = 1;</code>
*/
public Builder setDestinationBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000001;
destination_ = value;
onChanged();
return this;
}
// optional uint64 timestamp = 2;
private long timestamp_ ;
/**
* <code>optional uint64 timestamp = 2;</code>
*/
public boolean hasTimestamp() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional uint64 timestamp = 2;</code>
*/
public long getTimestamp() {
return timestamp_;
}
/**
* <code>optional uint64 timestamp = 2;</code>
*/
public Builder setTimestamp(long value) {
bitField0_ |= 0x00000002;
timestamp_ = value;
onChanged();
return this;
}
/**
* <code>optional uint64 timestamp = 2;</code>
*/
public Builder clearTimestamp() {
bitField0_ = (bitField0_ & ~0x00000002);
timestamp_ = 0L;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:textsecure.PushMessageContent.SyncMessageContext)
}
static {
defaultInstance = new SyncMessageContext(true);
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:textsecure.PushMessageContent.SyncMessageContext)
}
private int bitField0_; private int bitField0_;
// optional string body = 1; // optional string body = 1;
public static final int BODY_FIELD_NUMBER = 1; public static final int BODY_FIELD_NUMBER = 1;
@ -3261,11 +3849,34 @@ public final class PushMessageProtos {
return flags_; return flags_;
} }
// optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;
public static final int SYNC_FIELD_NUMBER = 5;
private org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext sync_;
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public boolean hasSync() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext getSync() {
return sync_;
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContextOrBuilder getSyncOrBuilder() {
return sync_;
}
private void initFields() { private void initFields() {
body_ = ""; body_ = "";
attachments_ = java.util.Collections.emptyList(); attachments_ = java.util.Collections.emptyList();
group_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance(); group_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
flags_ = 0; flags_ = 0;
sync_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@ -3291,6 +3902,9 @@ public final class PushMessageProtos {
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeUInt32(4, flags_); output.writeUInt32(4, flags_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(5, sync_);
}
getUnknownFields().writeTo(output); getUnknownFields().writeTo(output);
} }
@ -3316,6 +3930,10 @@ public final class PushMessageProtos {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, flags_); .computeUInt32Size(4, flags_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, sync_);
}
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
return size; return size;
@ -3426,6 +4044,7 @@ public final class PushMessageProtos {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getAttachmentsFieldBuilder(); getAttachmentsFieldBuilder();
getGroupFieldBuilder(); getGroupFieldBuilder();
getSyncFieldBuilder();
} }
} }
private static Builder create() { private static Builder create() {
@ -3450,6 +4069,12 @@ public final class PushMessageProtos {
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
flags_ = 0; flags_ = 0;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
if (syncBuilder_ == null) {
sync_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.getDefaultInstance();
} else {
syncBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000010);
return this; return this;
} }
@ -3503,6 +4128,14 @@ public final class PushMessageProtos {
to_bitField0_ |= 0x00000004; to_bitField0_ |= 0x00000004;
} }
result.flags_ = flags_; result.flags_ = flags_;
if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
to_bitField0_ |= 0x00000008;
}
if (syncBuilder_ == null) {
result.sync_ = sync_;
} else {
result.sync_ = syncBuilder_.build();
}
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
onBuilt(); onBuilt();
return result; return result;
@ -3556,6 +4189,9 @@ public final class PushMessageProtos {
if (other.hasFlags()) { if (other.hasFlags()) {
setFlags(other.getFlags()); setFlags(other.getFlags());
} }
if (other.hasSync()) {
mergeSync(other.getSync());
}
this.mergeUnknownFields(other.getUnknownFields()); this.mergeUnknownFields(other.getUnknownFields());
return this; return this;
} }
@ -4047,6 +4683,123 @@ public final class PushMessageProtos {
return this; return this;
} }
// optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;
private org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext sync_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContextOrBuilder> syncBuilder_;
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public boolean hasSync() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext getSync() {
if (syncBuilder_ == null) {
return sync_;
} else {
return syncBuilder_.getMessage();
}
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public Builder setSync(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext value) {
if (syncBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
sync_ = value;
onChanged();
} else {
syncBuilder_.setMessage(value);
}
bitField0_ |= 0x00000010;
return this;
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public Builder setSync(
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.Builder builderForValue) {
if (syncBuilder_ == null) {
sync_ = builderForValue.build();
onChanged();
} else {
syncBuilder_.setMessage(builderForValue.build());
}
bitField0_ |= 0x00000010;
return this;
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public Builder mergeSync(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext value) {
if (syncBuilder_ == null) {
if (((bitField0_ & 0x00000010) == 0x00000010) &&
sync_ != org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.getDefaultInstance()) {
sync_ =
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.newBuilder(sync_).mergeFrom(value).buildPartial();
} else {
sync_ = value;
}
onChanged();
} else {
syncBuilder_.mergeFrom(value);
}
bitField0_ |= 0x00000010;
return this;
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public Builder clearSync() {
if (syncBuilder_ == null) {
sync_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.getDefaultInstance();
onChanged();
} else {
syncBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.Builder getSyncBuilder() {
bitField0_ |= 0x00000010;
onChanged();
return getSyncFieldBuilder().getBuilder();
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContextOrBuilder getSyncOrBuilder() {
if (syncBuilder_ != null) {
return syncBuilder_.getMessageOrBuilder();
} else {
return sync_;
}
}
/**
* <code>optional .textsecure.PushMessageContent.SyncMessageContext sync = 5;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContextOrBuilder>
getSyncFieldBuilder() {
if (syncBuilder_ == null) {
syncBuilder_ = new com.google.protobuf.SingleFieldBuilder<
org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContext.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.SyncMessageContextOrBuilder>(
sync_,
getParentForChildren(),
isClean());
sync_ = null;
}
return syncBuilder_;
}
// @@protoc_insertion_point(builder_scope:textsecure.PushMessageContent) // @@protoc_insertion_point(builder_scope:textsecure.PushMessageContent)
} }
@ -4078,6 +4831,11 @@ public final class PushMessageProtos {
private static private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_textsecure_PushMessageContent_GroupContext_fieldAccessorTable; internal_static_textsecure_PushMessageContent_GroupContext_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_textsecure_PushMessageContent_SyncMessageContext_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_textsecure_PushMessageContent_SyncMessageContext_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() { getDescriptor() {
@ -4088,28 +4846,32 @@ public final class PushMessageProtos {
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n\037IncomingPushMessageSignal.proto\022\ntexts" + "\n\037IncomingPushMessageSignal.proto\022\ntexts" +
"ecure\"\224\002\n\031IncomingPushMessageSignal\0228\n\004t" + "ecure\"\236\002\n\031IncomingPushMessageSignal\0228\n\004t" +
"ype\030\001 \001(\0162*.textsecure.IncomingPushMessa" + "ype\030\001 \001(\0162*.textsecure.IncomingPushMessa" +
"geSignal.Type\022\016\n\006source\030\002 \001(\t\022\024\n\014sourceD" + "geSignal.Type\022\016\n\006source\030\002 \001(\t\022\024\n\014sourceD" +
"evice\030\007 \001(\r\022\r\n\005relay\030\003 \001(\t\022\021\n\ttimestamp\030" + "evice\030\007 \001(\r\022\r\n\005relay\030\003 \001(\t\022\021\n\ttimestamp\030" +
"\005 \001(\004\022\017\n\007message\030\006 \001(\014\"d\n\004Type\022\013\n\007UNKNOW" + "\005 \001(\004\022\017\n\007message\030\006 \001(\014\"n\n\004Type\022\013\n\007UNKNOW" +
"N\020\000\022\016\n\nCIPHERTEXT\020\001\022\020\n\014KEY_EXCHANGE\020\002\022\021\n" + "N\020\000\022\016\n\nCIPHERTEXT\020\001\022\020\n\014KEY_EXCHANGE\020\002\022\021\n" +
"\rPREKEY_BUNDLE\020\003\022\r\n\tPLAINTEXT\020\004\022\013\n\007RECEI" + "\rPREKEY_BUNDLE\020\003\022\r\n\tPLAINTEXT\020\004\022\013\n\007RECEI" +
"PT\020\005\"\207\004\n\022PushMessageContent\022\014\n\004body\030\001 \001(" + "PT\020\005\022\010\n\004COPY\020\006\"\206\005\n\022PushMessageContent\022\014\n" +
"\t\022E\n\013attachments\030\002 \003(\01320.textsecure.Push", "\004body\030\001 \001(\t\022E\n\013attachments\030\002 \003(\01320.texts",
"MessageContent.AttachmentPointer\022:\n\005grou" + "ecure.PushMessageContent.AttachmentPoint" +
"p\030\003 \001(\0132+.textsecure.PushMessageContent." + "er\022:\n\005group\030\003 \001(\0132+.textsecure.PushMessa" +
"GroupContext\022\r\n\005flags\030\004 \001(\r\032A\n\021Attachmen" + "geContent.GroupContext\022\r\n\005flags\030\004 \001(\r\022?\n" +
"tPointer\022\n\n\002id\030\001 \001(\006\022\023\n\013contentType\030\002 \001(" + "\004sync\030\005 \001(\01321.textsecure.PushMessageCont" +
"\t\022\013\n\003key\030\003 \001(\014\032\363\001\n\014GroupContext\022\n\n\002id\030\001 " + "ent.SyncMessageContext\032A\n\021AttachmentPoin" +
"\001(\014\022>\n\004type\030\002 \001(\01620.textsecure.PushMessa" + "ter\022\n\n\002id\030\001 \001(\006\022\023\n\013contentType\030\002 \001(\t\022\013\n\003" +
"geContent.GroupContext.Type\022\014\n\004name\030\003 \001(" + "key\030\003 \001(\014\032\363\001\n\014GroupContext\022\n\n\002id\030\001 \001(\014\022>" +
"\t\022\017\n\007members\030\004 \003(\t\022@\n\006avatar\030\005 \001(\01320.tex" + "\n\004type\030\002 \001(\01620.textsecure.PushMessageCon" +
"tsecure.PushMessageContent.AttachmentPoi" + "tent.GroupContext.Type\022\014\n\004name\030\003 \001(\t\022\017\n\007" +
"nter\"6\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n", "members\030\004 \003(\t\022@\n\006avatar\030\005 \001(\01320.textsecu",
"\007DELIVER\020\002\022\010\n\004QUIT\020\003\"\030\n\005Flags\022\017\n\013END_SES" + "re.PushMessageContent.AttachmentPointer\"" +
"SION\020\001B@\n+org.whispersystems.textsecure." + "6\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELI" +
"internal.pushB\021PushMessageProtos" "VER\020\002\022\010\n\004QUIT\020\003\032<\n\022SyncMessageContext\022\023\n" +
"\013destination\030\001 \001(\t\022\021\n\ttimestamp\030\002 \001(\004\"\030\n" +
"\005Flags\022\017\n\013END_SESSION\020\001B@\n+org.whispersy" +
"stems.textsecure.internal.pushB\021PushMess" +
"ageProtos"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -4127,7 +4889,7 @@ public final class PushMessageProtos {
internal_static_textsecure_PushMessageContent_fieldAccessorTable = new internal_static_textsecure_PushMessageContent_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_textsecure_PushMessageContent_descriptor, internal_static_textsecure_PushMessageContent_descriptor,
new java.lang.String[] { "Body", "Attachments", "Group", "Flags", }); new java.lang.String[] { "Body", "Attachments", "Group", "Flags", "Sync", });
internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor = internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor =
internal_static_textsecure_PushMessageContent_descriptor.getNestedTypes().get(0); internal_static_textsecure_PushMessageContent_descriptor.getNestedTypes().get(0);
internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable = new internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable = new
@ -4140,6 +4902,12 @@ public final class PushMessageProtos {
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_textsecure_PushMessageContent_GroupContext_descriptor, internal_static_textsecure_PushMessageContent_GroupContext_descriptor,
new java.lang.String[] { "Id", "Type", "Name", "Members", "Avatar", }); new java.lang.String[] { "Id", "Type", "Name", "Members", "Avatar", });
internal_static_textsecure_PushMessageContent_SyncMessageContext_descriptor =
internal_static_textsecure_PushMessageContent_descriptor.getNestedTypes().get(2);
internal_static_textsecure_PushMessageContent_SyncMessageContext_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_textsecure_PushMessageContent_SyncMessageContext_descriptor,
new java.lang.String[] { "Destination", "Timestamp", });
return null; return null;
} }
}; };

30
libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java
View File

@ -79,11 +79,15 @@ public class PushServiceSocket {
private static final String CREATE_ACCOUNT_VOICE_PATH = "/v1/accounts/voice/code/%s"; private static final String CREATE_ACCOUNT_VOICE_PATH = "/v1/accounts/voice/code/%s";
private static final String VERIFY_ACCOUNT_PATH = "/v1/accounts/code/%s"; private static final String VERIFY_ACCOUNT_PATH = "/v1/accounts/code/%s";
private static final String REGISTER_GCM_PATH = "/v1/accounts/gcm/"; private static final String REGISTER_GCM_PATH = "/v1/accounts/gcm/";
private static final String PREKEY_METADATA_PATH = "/v2/keys/"; private static final String PREKEY_METADATA_PATH = "/v2/keys/";
private static final String PREKEY_PATH = "/v2/keys/%s"; private static final String PREKEY_PATH = "/v2/keys/%s";
private static final String PREKEY_DEVICE_PATH = "/v2/keys/%s/%s"; private static final String PREKEY_DEVICE_PATH = "/v2/keys/%s/%s";
private static final String SIGNED_PREKEY_PATH = "/v2/keys/signed"; private static final String SIGNED_PREKEY_PATH = "/v2/keys/signed";
private static final String PROVISIONING_CODE_PATH = "/v1/devices/provisioning/code";
private static final String PROVISIONING_MESSAGE_PATH = "/v1/provisioning/%s";
private static final String DIRECTORY_TOKENS_PATH = "/v1/directory/tokens"; private static final String DIRECTORY_TOKENS_PATH = "/v1/directory/tokens";
private static final String DIRECTORY_VERIFY_PATH = "/v1/directory/%s"; private static final String DIRECTORY_VERIFY_PATH = "/v1/directory/%s";
private static final String MESSAGE_PATH = "/v1/messages/%s"; private static final String MESSAGE_PATH = "/v1/messages/%s";
@ -120,6 +124,16 @@ public class PushServiceSocket {
"PUT", new Gson().toJson(signalingKeyEntity)); "PUT", new Gson().toJson(signalingKeyEntity));
} }
public String getNewDeviceVerificationCode() throws IOException {
String responseText = makeRequest(PROVISIONING_CODE_PATH, "GET", null);
return new Gson().fromJson(responseText, DeviceCode.class).getVerificationCode();
}
public void sendProvisioningMessage(String destination, byte[] body) throws IOException {
makeRequest(String.format(PROVISIONING_MESSAGE_PATH, destination), "PUT",
new Gson().toJson(new ProvisioningMessage(Base64.encodeBytes(body))));
}
public void sendReceipt(String destination, long messageId, String relay) throws IOException { public void sendReceipt(String destination, long messageId, String relay) throws IOException {
String path = String.format(RECEIPT_PATH, destination, messageId); String path = String.format(RECEIPT_PATH, destination, messageId);
@ -139,11 +153,15 @@ public class PushServiceSocket {
makeRequest(REGISTER_GCM_PATH, "DELETE", null); makeRequest(REGISTER_GCM_PATH, "DELETE", null);
} }
public void sendMessage(OutgoingPushMessageList bundle) public SendMessageResponse sendMessage(OutgoingPushMessageList bundle)
throws IOException throws IOException
{ {
try { try {
makeRequest(String.format(MESSAGE_PATH, bundle.getDestination()), "PUT", new Gson().toJson(bundle)); String responseText = makeRequest(String.format(MESSAGE_PATH, bundle.getDestination()), "PUT", new Gson().toJson(bundle));
if (responseText == null) return new SendMessageResponse(false);
else return new Gson().fromJson(responseText, SendMessageResponse.class);
} catch (NotFoundException nfe) { } catch (NotFoundException nfe) {
throw new UnregisteredUserException(bundle.getDestination(), nfe); throw new UnregisteredUserException(bundle.getDestination(), nfe);
} }
@ -183,9 +201,9 @@ public class PushServiceSocket {
return preKeyStatus.getCount(); return preKeyStatus.getCount();
} }
public List<PreKeyBundle> getPreKeys(PushAddress destination) throws IOException { public List<PreKeyBundle> getPreKeys(PushAddress destination, int deviceIdInteger) throws IOException {
try { try {
String deviceId = String.valueOf(destination.getDeviceId()); String deviceId = String.valueOf(deviceIdInteger);
if (deviceId.equals("1")) if (deviceId.equals("1"))
deviceId = "*"; deviceId = "*";
@ -231,10 +249,10 @@ public class PushServiceSocket {
} }
} }
public PreKeyBundle getPreKey(PushAddress destination) throws IOException { public PreKeyBundle getPreKey(PushAddress destination, int deviceId) throws IOException {
try { try {
String path = String.format(PREKEY_DEVICE_PATH, destination.getNumber(), String path = String.format(PREKEY_DEVICE_PATH, destination.getNumber(),
String.valueOf(destination.getDeviceId())); String.valueOf(deviceId));
if (!Util.isEmpty(destination.getRelay())) { if (!Util.isEmpty(destination.getRelay())) {
path = path + "?relay=" + destination.getRelay(); path = path + "?relay=" + destination.getRelay();

16
libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/SendMessageResponse.java Normal file
View File

@ -0,0 +1,16 @@
package org.whispersystems.textsecure.internal.push;
public class SendMessageResponse {
private boolean needsSync;
public SendMessageResponse() {}
public SendMessageResponse(boolean needsSync) {
this.needsSync = needsSync;
}
public boolean getNeedsSync() {
return needsSync;
}
}

13
libtextsecure/src/main/java/org/whispersystems/textsecure/internal/util/Util.java
View File

@ -25,6 +25,19 @@ import java.security.SecureRandom;
public class Util { public class Util {
public static byte[] join(byte[]... input) {
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (byte[] part : input) {
baos.write(part);
}
return baos.toByteArray();
} catch (IOException e) {
throw new AssertionError(e);
}
}
public static byte[][] split(byte[] input, int firstLength, int secondLength) { public static byte[][] split(byte[] input, int firstLength, int secondLength) {
byte[][] parts = new byte[2][]; byte[][] parts = new byte[2][];

46
res/layout/device_provisioning_activity.xml Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerInParent="true">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:text="Add device?"
android:id="@+id/textView"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="left"
android:text="The device you scanned will receive access to all incoming and outgoing messages."/>
<LinearLayout android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button android:id="@+id/cancel_button"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Cancel"/>
<Button android:id="@+id/continue_button"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Continue"/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

124
src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java Normal file
View File

@ -0,0 +1,124 @@
package org.thoughtcrime.securesms;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.Toast;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
import org.whispersystems.libaxolotl.IdentityKeyPair;
import org.whispersystems.libaxolotl.InvalidKeyException;
import org.whispersystems.libaxolotl.ecc.Curve;
import org.whispersystems.libaxolotl.ecc.ECPublicKey;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
import org.whispersystems.textsecure.api.push.exceptions.NotFoundException;
import java.io.IOException;
public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActivity {
private static final String TAG = DeviceProvisioningActivity.class.getSimpleName();
private Button continueButton;
private Button cancelButton;
private Uri uri;
private MasterSecret masterSecret;
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
setContentView(R.layout.device_provisioning_activity);
initializeResources();
}
@Override
public void onNewMasterSecret(MasterSecret masterSecret) {
this.masterSecret = masterSecret;
}
private void initializeResources() {
this.continueButton = (Button)findViewById(R.id.continue_button);
this.cancelButton = (Button)findViewById(R.id.cancel_button);
this.uri = getIntent().getData();
this.continueButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
handleProvisioning();
}
});
this.cancelButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
}
private void handleProvisioning() {
new ProgressDialogAsyncTask<Void, Void, Integer>(this, "Adding device...", "Adding new device...") {
private static final int SUCCESS = 0;
private static final int NO_DEVICE = 1;
private static final int NETWORK_ERROR = 2;
private static final int KEY_ERROR = 3;
@Override
protected Integer doInBackground(Void... params) {
try {
Context context = DeviceProvisioningActivity.this;
TextSecureAccountManager accountManager = TextSecureCommunicationFactory.createManager(context);
String verificationCode = accountManager.getNewDeviceVerificationCode();
String ephemeralId = uri.getQueryParameter("uuid");
String publicKeyEncoded = uri.getQueryParameter("pub_key");
ECPublicKey publicKey = Curve.decodePoint(Base64.decode(publicKeyEncoded), 0);
IdentityKeyPair identityKeyPair = IdentityKeyUtil.getIdentityKeyPair(context, masterSecret);
accountManager.addDevice(ephemeralId, publicKey, identityKeyPair, verificationCode);
return SUCCESS;
} catch (NotFoundException e) {
Log.w(TAG, e);
return NO_DEVICE;
} catch (IOException e) {
Log.w(TAG, e);
return NETWORK_ERROR;
} catch (InvalidKeyException e) {
Log.w(TAG, e);
return KEY_ERROR;
}
}
@Override
protected void onPostExecute(Integer result) {
super.onPostExecute(result);
Context context = DeviceProvisioningActivity.this;
switch (result) {
case SUCCESS:
Toast.makeText(context, "Device added!", Toast.LENGTH_SHORT).show();
finish();
break;
case NO_DEVICE:
Toast.makeText(context, "No device found!", Toast.LENGTH_LONG).show();
break;
case NETWORK_ERROR:
Toast.makeText(context, "Network error!", Toast.LENGTH_LONG).show();
break;
case KEY_ERROR:
Toast.makeText(context, "Invalid QR code!", Toast.LENGTH_LONG).show();
break;
}
}
}.execute();
}
}

26
src/org/thoughtcrime/securesms/dependencies/TextSecureCommunicationModule.java
View File

@ -16,11 +16,15 @@ import org.thoughtcrime.securesms.jobs.PushTextSendJob;
import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob; import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
import org.thoughtcrime.securesms.push.SecurityEventListener; import org.thoughtcrime.securesms.push.SecurityEventListener;
import org.thoughtcrime.securesms.push.TextSecurePushTrustStore; import org.thoughtcrime.securesms.push.TextSecurePushTrustStore;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.libaxolotl.util.guava.Optional; import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager; import org.whispersystems.textsecure.api.TextSecureAccountManager;
import org.whispersystems.textsecure.api.TextSecureMessageReceiver; import org.whispersystems.textsecure.api.TextSecureMessageReceiver;
import org.whispersystems.textsecure.api.TextSecureMessageSender; import org.whispersystems.textsecure.api.TextSecureMessageSender;
import org.whispersystems.textsecure.api.push.PushAddress;
import dagger.Module; import dagger.Module;
import dagger.Provides; import dagger.Provides;
@ -52,13 +56,21 @@ public class TextSecureCommunicationModule {
return new TextSecureMessageSenderFactory() { return new TextSecureMessageSenderFactory() {
@Override @Override
public TextSecureMessageSender create(MasterSecret masterSecret) { public TextSecureMessageSender create(MasterSecret masterSecret) {
return new TextSecureMessageSender(Release.PUSH_URL, try {
new TextSecurePushTrustStore(context), String localNumber = TextSecurePreferences.getLocalNumber(context);
TextSecurePreferences.getLocalNumber(context), Recipient localRecipient = RecipientFactory.getRecipientsFromString(context, localNumber, false).getPrimaryRecipient();
TextSecurePreferences.getPushServerPassword(context),
new TextSecureAxolotlStore(context, masterSecret), return new TextSecureMessageSender(Release.PUSH_URL,
Optional.of((TextSecureMessageSender.EventListener) new TextSecurePushTrustStore(context),
new SecurityEventListener(context))); TextSecurePreferences.getLocalNumber(context),
TextSecurePreferences.getPushServerPassword(context),
localRecipient.getRecipientId(),
new TextSecureAxolotlStore(context, masterSecret),
Optional.of((TextSecureMessageSender.EventListener)
new SecurityEventListener(context)));
} catch (RecipientFormattingException e) {
throw new AssertionError(e);
}
} }
}; };
} }

2
src/org/thoughtcrime/securesms/jobs/DeliveryReceiptJob.java
View File

@ -46,7 +46,7 @@ public class DeliveryReceiptJob extends ContextJob implements InjectableType {
public void onRun() throws IOException { public void onRun() throws IOException {
Log.w("DeliveryReceiptJob", "Sending delivery receipt..."); Log.w("DeliveryReceiptJob", "Sending delivery receipt...");
TextSecureMessageSender messageSender = messageSenderFactory.create(null); TextSecureMessageSender messageSender = messageSenderFactory.create(null);
PushAddress pushAddress = new PushAddress(-1, destination, 1, relay); PushAddress pushAddress = new PushAddress(-1, destination, relay);
messageSender.sendDeliveryReceipt(pushAddress, timestamp); messageSender.sendDeliveryReceipt(pushAddress, timestamp);
} }

7
src/org/thoughtcrime/securesms/jobs/PushSendJob.java
View File

@ -5,11 +5,9 @@ import android.util.Log;
import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.TextSecureDirectory;
import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement; import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement;
import org.thoughtcrime.securesms.mms.MmsMediaConstraints;
import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.mms.MediaConstraints;
import org.thoughtcrime.securesms.mms.PushMediaConstraints;
import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.Recipients; import org.thoughtcrime.securesms.recipients.Recipients;
@ -20,7 +18,6 @@ import org.whispersystems.jobqueue.JobParameters;
import org.whispersystems.jobqueue.requirements.NetworkRequirement; import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.textsecure.api.messages.TextSecureAttachment; import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream; import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream;
import org.thoughtcrime.securesms.database.TextSecureDirectory;
import org.whispersystems.textsecure.api.push.PushAddress; import org.whispersystems.textsecure.api.push.PushAddress;
import org.whispersystems.textsecure.api.util.InvalidNumberException; import org.whispersystems.textsecure.api.util.InvalidNumberException;
@ -82,7 +79,7 @@ public abstract class PushSendJob extends SendJob {
protected PushAddress getPushAddress(Recipient recipient) throws InvalidNumberException { protected PushAddress getPushAddress(Recipient recipient) throws InvalidNumberException {
String e164number = Util.canonicalizeNumber(context, recipient.getNumber()); String e164number = Util.canonicalizeNumber(context, recipient.getNumber());
String relay = TextSecureDirectory.getInstance(context).getRelay(e164number); String relay = TextSecureDirectory.getInstance(context).getRelay(e164number);
return new PushAddress(recipient.getRecipientId(), e164number, 1, relay); return new PushAddress(recipient.getRecipientId(), e164number, relay);
} }
protected boolean isSmsFallbackApprovalRequired(String destination, boolean media) { protected boolean isSmsFallbackApprovalRequired(String destination, boolean media) {

32
src/org/thoughtcrime/securesms/service/RegistrationService.java
View File

@ -16,8 +16,12 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.crypto.PreKeyUtil; import org.thoughtcrime.securesms.crypto.PreKeyUtil;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.jobs.GcmRefreshJob; import org.thoughtcrime.securesms.jobs.GcmRefreshJob;
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory; import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
import org.thoughtcrime.securesms.util.DirectoryHelper; import org.thoughtcrime.securesms.util.DirectoryHelper;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
@ -230,21 +234,27 @@ public class RegistrationService extends Service {
throws IOException throws IOException
{ {
setState(new RegistrationState(RegistrationState.STATE_GENERATING_KEYS, number)); setState(new RegistrationState(RegistrationState.STATE_GENERATING_KEYS, number));
IdentityKeyPair identityKey = IdentityKeyUtil.getIdentityKeyPair(this, masterSecret); try {
List<PreKeyRecord> records = PreKeyUtil.generatePreKeys(this, masterSecret); Recipient self = RecipientFactory.getRecipientsFromString(this, number, false).getPrimaryRecipient();
PreKeyRecord lastResort = PreKeyUtil.generateLastResortKey(this, masterSecret); IdentityKeyPair identityKey = IdentityKeyUtil.getIdentityKeyPair(this, masterSecret);
SignedPreKeyRecord signedPreKey = PreKeyUtil.generateSignedPreKey(this, masterSecret, identityKey); List<PreKeyRecord> records = PreKeyUtil.generatePreKeys(this, masterSecret);
accountManager.setPreKeys(identityKey.getPublicKey(),lastResort, signedPreKey, records); PreKeyRecord lastResort = PreKeyUtil.generateLastResortKey(this, masterSecret);
SignedPreKeyRecord signedPreKey = PreKeyUtil.generateSignedPreKey(this, masterSecret, identityKey);
accountManager.setPreKeys(identityKey.getPublicKey(),lastResort, signedPreKey, records);
setState(new RegistrationState(RegistrationState.STATE_GCM_REGISTERING, number)); setState(new RegistrationState(RegistrationState.STATE_GCM_REGISTERING, number));
String gcmRegistrationId = GoogleCloudMessaging.getInstance(this).register(GcmRefreshJob.REGISTRATION_ID); String gcmRegistrationId = GoogleCloudMessaging.getInstance(this).register(GcmRefreshJob.REGISTRATION_ID);
TextSecurePreferences.setGcmRegistrationId(this, gcmRegistrationId); TextSecurePreferences.setGcmRegistrationId(this, gcmRegistrationId);
accountManager.setGcmId(Optional.of(gcmRegistrationId)); accountManager.setGcmId(Optional.of(gcmRegistrationId));
DirectoryHelper.refreshDirectory(this, accountManager, number); DatabaseFactory.getIdentityDatabase(this).saveIdentity(masterSecret, self.getRecipientId(), identityKey.getPublicKey());
DirectoryHelper.refreshDirectory(this, accountManager, number);
DirectoryRefreshListener.schedule(this); DirectoryRefreshListener.schedule(this);
} catch (RecipientFormattingException e) {
throw new IOException(e);
}
} }
private synchronized String waitForChallenge() throws AccountVerificationTimeoutException { private synchronized String waitForChallenge() throws AccountVerificationTimeoutException {