diff --git a/library/protobuf/IncomingPushMessageSignal.proto b/library/protobuf/IncomingPushMessageSignal.proto
index 1e82872705..90465ae279 100644
--- a/library/protobuf/IncomingPushMessageSignal.proto
+++ b/library/protobuf/IncomingPushMessageSignal.proto
@@ -7,13 +7,18 @@ message IncomingPushMessageSignal {
optional uint32 type = 1;
optional string source = 2;
repeated string destinations = 3;
- optional bytes message = 4;
+ optional uint64 timestamp = 4;
+ optional bytes message = 5; // Contains an encrypted IncomingPushMessageContent
+}
+
+message PushMessageContent {
+ optional string body = 1;
message AttachmentPointer {
- optional string contentType = 1;
- optional string key = 2;
+ optional fixed64 id = 1;
+ optional string contentType = 2;
+ optional bytes key = 3;
}
- repeated AttachmentPointer attachments = 5;
- optional uint64 timestamp = 6;
+ repeated AttachmentPointer attachments = 2;
}
\ No newline at end of file
diff --git a/library/src/org/whispersystems/textsecure/crypto/AttachmentCipher.java b/library/src/org/whispersystems/textsecure/crypto/AttachmentCipher.java
new file mode 100644
index 0000000000..4496f8653a
--- /dev/null
+++ b/library/src/org/whispersystems/textsecure/crypto/AttachmentCipher.java
@@ -0,0 +1,156 @@
+/**
+ * Copyright (C) 2013 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package org.whispersystems.textsecure.crypto;
+
+import android.util.Log;
+
+import org.whispersystems.textsecure.util.Hex;
+import org.whispersystems.textsecure.util.Util;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.Mac;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+/**
+ * Encrypts push attachments.
+ *
+ * @author Moxie Marlinspike
+ */
+public class AttachmentCipher {
+
+ static final int CIPHER_KEY_SIZE = 32;
+ static final int MAC_KEY_SIZE = 20;
+
+ private final SecretKeySpec cipherKey;
+ private final SecretKeySpec macKey;
+ private final Cipher cipher;
+ private final Mac mac;
+
+ public AttachmentCipher() {
+ this.cipherKey = initializeRandomCipherKey();
+ this.macKey = initializeRandomMacKey();
+ this.cipher = initializeCipher();
+ this.mac = initializeMac();
+ }
+
+ public AttachmentCipher(byte[] combinedKeyMaterial) {
+ byte[][] parts = Util.split(combinedKeyMaterial, CIPHER_KEY_SIZE, MAC_KEY_SIZE);
+ this.cipherKey = new SecretKeySpec(parts[0], "AES");
+ this.macKey = new SecretKeySpec(parts[1], "HmacSHA1");
+ this.cipher = initializeCipher();
+ this.mac = initializeMac();
+ }
+
+ public byte[] getCombinedKeyMaterial() {
+ return Util.combine(this.cipherKey.getEncoded(), this.macKey.getEncoded());
+ }
+
+ public byte[] encrypt(byte[] plaintext) {
+ try {
+ this.cipher.init(Cipher.ENCRYPT_MODE, this.cipherKey);
+ this.mac.init(this.macKey);
+
+ byte[] ciphertext = this.cipher.doFinal(plaintext);
+ byte[] iv = this.cipher.getIV();
+ byte[] mac = this.mac.doFinal(Util.combine(iv, ciphertext));
+
+ return Util.combine(iv, ciphertext, mac);
+ } catch (IllegalBlockSizeException e) {
+ throw new AssertionError(e);
+ } catch (BadPaddingException e) {
+ throw new AssertionError(e);
+ } catch (InvalidKeyException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ public byte[] decrypt(byte[] ciphertext)
+ throws InvalidMacException, InvalidMessageException
+ {
+ try {
+ if (ciphertext.length <= cipher.getBlockSize() + mac.getMacLength()) {
+ throw new InvalidMessageException("Message too short!");
+ }
+
+ byte[][] ciphertextParts = Util.split(ciphertext,
+ this.cipher.getBlockSize(),
+ ciphertext.length - this.cipher.getBlockSize() - this.mac.getMacLength(),
+ this.mac.getMacLength());
+
+ this.mac.update(ciphertext, 0, ciphertext.length - mac.getMacLength());
+ byte[] ourMac = this.mac.doFinal();
+
+ if (!Arrays.equals(ourMac, ciphertextParts[2])) {
+ throw new InvalidMacException("Mac doesn't match!");
+ }
+
+ this.cipher.init(Cipher.DECRYPT_MODE, this.cipherKey,
+ new IvParameterSpec(ciphertextParts[0]));
+
+ return cipher.doFinal(ciphertextParts[1]);
+ } catch (InvalidKeyException e) {
+ throw new AssertionError(e);
+ } catch (InvalidAlgorithmParameterException e) {
+ throw new AssertionError(e);
+ } catch (IllegalBlockSizeException e) {
+ throw new AssertionError(e);
+ } catch (BadPaddingException e) {
+ throw new InvalidMessageException(e);
+ }
+ }
+
+ private Mac initializeMac() {
+ try {
+ Mac mac = Mac.getInstance("HmacSHA1");
+ return mac;
+ } catch (NoSuchAlgorithmException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ private Cipher initializeCipher() {
+ try {
+ Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+ return cipher;
+ } catch (NoSuchAlgorithmException e) {
+ throw new AssertionError(e);
+ } catch (NoSuchPaddingException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ private SecretKeySpec initializeRandomCipherKey() {
+ byte[] key = new byte[CIPHER_KEY_SIZE];
+ Util.getSecureRandom().nextBytes(key);
+ return new SecretKeySpec(key, "AES");
+ }
+
+ private SecretKeySpec initializeRandomMacKey() {
+ byte[] key = new byte[MAC_KEY_SIZE];
+ Util.getSecureRandom().nextBytes(key);
+ return new SecretKeySpec(key, "HmacSHA1");
+ }
+
+}
diff --git a/library/src/org/whispersystems/textsecure/crypto/AttachmentCipherInputStream.java b/library/src/org/whispersystems/textsecure/crypto/AttachmentCipherInputStream.java
new file mode 100644
index 0000000000..753e4c80fd
--- /dev/null
+++ b/library/src/org/whispersystems/textsecure/crypto/AttachmentCipherInputStream.java
@@ -0,0 +1,178 @@
+/**
+ * Copyright (C) 2013 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package org.whispersystems.textsecure.crypto;
+
+import android.util.Log;
+
+import org.whispersystems.textsecure.util.Hex;
+import org.whispersystems.textsecure.util.Util;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.Mac;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.ShortBufferException;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+/**
+ * Class for streaming an encrypted push attachment off disk.
+ *
+ * @author Moxie Marlinspike
+ */
+
+public class AttachmentCipherInputStream extends FileInputStream {
+
+ private static final int BLOCK_SIZE = 16;
+
+ private Cipher cipher;
+ private boolean done;
+ private long totalDataSize;
+ private long totalRead;
+
+ public AttachmentCipherInputStream(File file, byte[] combinedKeyMaterial)
+ throws IOException, InvalidMessageException
+ {
+ super(file);
+
+ try {
+ byte[][] parts = Util.split(combinedKeyMaterial,
+ AttachmentCipher.CIPHER_KEY_SIZE,
+ AttachmentCipher.MAC_KEY_SIZE);
+
+ Mac mac = Mac.getInstance("HmacSHA1");
+ mac.init(new SecretKeySpec(parts[1], "HmacSHA1"));
+
+ if (file.length() <= BLOCK_SIZE + mac.getMacLength()) {
+ throw new InvalidMessageException("Message shorter than crypto overhead!");
+ }
+
+ verifyMac(file, mac);
+
+ byte[] iv = new byte[BLOCK_SIZE];
+ readFully(iv);
+
+ this.cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+ this.cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(parts[0], "AES"), new IvParameterSpec(iv));
+
+ this.done = false;
+ this.totalRead = 0;
+ this.totalDataSize = file.length() - cipher.getBlockSize() - mac.getMacLength();
+ } catch (NoSuchAlgorithmException e) {
+ throw new AssertionError(e);
+ } catch (InvalidKeyException e) {
+ throw new AssertionError(e);
+ } catch (InvalidMacException e) {
+ throw new InvalidMessageException(e);
+ } catch (NoSuchPaddingException e) {
+ throw new AssertionError(e);
+ } catch (InvalidAlgorithmParameterException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Override
+ public int read(byte[] buffer) throws IOException {
+ return read(buffer, 0, buffer.length);
+ }
+
+ @Override
+ public int read(byte[] buffer, int offset, int length) throws IOException {
+ if (totalRead != totalDataSize) return readIncremental(buffer, offset, length);
+ else if (!done) return readFinal(buffer, offset, length);
+ else return -1;
+ }
+
+ private int readFinal(byte[] buffer, int offset, int length) throws IOException {
+ try {
+ int flourish = cipher.doFinal(buffer, offset);
+
+ done = true;
+ return flourish;
+ } catch (IllegalBlockSizeException e) {
+ Log.w("EncryptingPartInputStream", e);
+ throw new IOException("Illegal block size exception!");
+ } catch (ShortBufferException e) {
+ Log.w("EncryptingPartInputStream", e);
+ throw new IOException("Short buffer exception!");
+ } catch (BadPaddingException e) {
+ Log.w("EncryptingPartInputStream", e);
+ throw new IOException("Bad padding exception!");
+ }
+ }
+
+ private int readIncremental(byte[] buffer, int offset, int length) throws IOException {
+ if (length + totalRead > totalDataSize)
+ length = (int)(totalDataSize - totalRead);
+
+ byte[] internalBuffer = new byte[length];
+ int read = super.read(internalBuffer, 0, internalBuffer.length <= cipher.getBlockSize() ? internalBuffer.length : internalBuffer.length - cipher.getBlockSize());
+ totalRead += read;
+
+ try {
+ return cipher.update(internalBuffer, 0, read, buffer, offset);
+ } catch (ShortBufferException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ private void verifyMac(File file, Mac mac) throws FileNotFoundException, InvalidMacException {
+ try {
+ FileInputStream fin = new FileInputStream(file);
+ int remainingData = (int) file.length() - mac.getMacLength();
+ byte[] buffer = new byte[4096];
+
+ while (remainingData > 0) {
+ int read = fin.read(buffer, 0, Math.min(buffer.length, remainingData));
+ mac.update(buffer, 0, read);
+ remainingData -= read;
+ }
+
+ byte[] ourMac = mac.doFinal();
+ byte[] theirMac = new byte[mac.getMacLength()];
+ Util.readFully(fin, theirMac);
+
+ if (!Arrays.equals(ourMac, theirMac)) {
+ throw new InvalidMacException("MAC doesn't match!");
+ }
+ } catch (IOException e1) {
+ throw new InvalidMacException(e1);
+ }
+ }
+
+ private void readFully(byte[] buffer) throws IOException {
+ int offset = 0;
+
+ for (;;) {
+ int read = super.read(buffer, offset, buffer.length - offset);
+
+ if (read + offset < buffer.length) offset += read;
+ else return;
+ }
+ }
+
+
+}
diff --git a/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java b/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java
index 57b2fd1427..8de52cd294 100644
--- a/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java
+++ b/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java
@@ -1,12 +1,26 @@
+/**
+ * Copyright (C) 2013 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
package org.whispersystems.textsecure.push;
-import org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal;
-import org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer;
-import org.whispersystems.textsecure.util.Base64;
-
import android.os.Parcel;
import android.os.Parcelable;
+import org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal;
+
import java.util.LinkedList;
import java.util.List;
@@ -24,12 +38,20 @@ public class IncomingPushMessage implements PushMessage, Parcelable {
}
};
- private int type;
- private String source;
- private List destinations;
- private byte[] message;
- private List attachments;
- private long timestamp;
+ private int type;
+ private String source;
+ private List destinations;
+ private byte[] message;
+ private long timestamp;
+
+ private IncomingPushMessage(IncomingPushMessage message, byte[] body) {
+ this.type = message.type;
+ this.source = message.source;
+ this.destinations = new LinkedList();
+ this.destinations.addAll(message.destinations);
+ this.message = body;
+ this.timestamp = message.timestamp;
+ }
public IncomingPushMessage(IncomingPushMessageSignal signal) {
this.type = signal.getType();
@@ -37,25 +59,15 @@ public class IncomingPushMessage implements PushMessage, Parcelable {
this.destinations = signal.getDestinationsList();
this.message = signal.getMessage().toByteArray();
this.timestamp = signal.getTimestamp();
- this.attachments = new LinkedList();
-
- List attachmentPointers = signal.getAttachmentsList();
-
- for (AttachmentPointer pointer : attachmentPointers) {
- this.attachments.add(new PushAttachmentPointer(pointer.getContentType(), pointer.getKey()));
- }
}
public IncomingPushMessage(Parcel in) {
this.destinations = new LinkedList();
- this.attachments = new LinkedList();
-
this.type = in.readInt();
this.source = in.readString();
in.readStringList(destinations);
this.message = new byte[in.readInt()];
in.readByteArray(this.message);
- in.readList(attachments, PushAttachmentPointer.class.getClassLoader());
this.timestamp = in.readLong();
}
@@ -67,10 +79,6 @@ public class IncomingPushMessage implements PushMessage, Parcelable {
return source;
}
- public List getAttachments() {
- return attachments;
- }
-
public byte[] getBody() {
return message;
}
@@ -79,10 +87,6 @@ public class IncomingPushMessage implements PushMessage, Parcelable {
return destinations;
}
- public boolean hasAttachments() {
- return getAttachments() != null && !getAttachments().isEmpty();
- }
-
@Override
public int describeContents() {
return 0;
@@ -95,11 +99,22 @@ public class IncomingPushMessage implements PushMessage, Parcelable {
dest.writeStringList(destinations);
dest.writeInt(message.length);
dest.writeByteArray(message);
- dest.writeList(attachments);
dest.writeLong(timestamp);
}
+ public IncomingPushMessage withBody(byte[] body) {
+ return new IncomingPushMessage(this, body);
+ }
+
public int getType() {
return type;
}
+
+ public boolean isSecureMessage() {
+ return getType() == PushMessage.TYPE_MESSAGE_CIPHERTEXT;
+ }
+
+ public boolean isPreKeyBundle() {
+ return getType() == PushMessage.TYPE_MESSAGE_PREKEY_BUNDLE;
+ }
}
diff --git a/library/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java b/library/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java
index 487a0da07d..1cfe139895 100644
--- a/library/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java
+++ b/library/src/org/whispersystems/textsecure/push/OutgoingPushMessage.java
@@ -1,34 +1,35 @@
+/**
+ * Copyright (C) 2013 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
package org.whispersystems.textsecure.push;
import org.whispersystems.textsecure.util.Base64;
-import java.util.LinkedList;
-import java.util.List;
-
public class OutgoingPushMessage implements PushMessage {
- private int type;
- private String destination;
- private String body;
- private List attachments;
+ private int type;
+ private String destination;
+ private String body;
public OutgoingPushMessage(String destination, byte[] body, int type) {
- this.attachments = new LinkedList();
this.destination = destination;
this.body = Base64.encodeBytes(body);
this.type = type;
}
- public OutgoingPushMessage(String destination, byte[] body,
- List attachments,
- int type)
- {
- this.destination = destination;
- this.body = Base64.encodeBytes(body);
- this.attachments = attachments;
- this.type = type;
- }
-
public String getDestination() {
return destination;
}
@@ -37,10 +38,6 @@ public class OutgoingPushMessage implements PushMessage {
return body;
}
- public List getAttachments() {
- return attachments;
- }
-
public int getType() {
return type;
}
diff --git a/library/src/org/whispersystems/textsecure/push/PushAttachmentPointer.java b/library/src/org/whispersystems/textsecure/push/PushAttachmentPointer.java
index 8a3a81286e..30e893861b 100644
--- a/library/src/org/whispersystems/textsecure/push/PushAttachmentPointer.java
+++ b/library/src/org/whispersystems/textsecure/push/PushAttachmentPointer.java
@@ -18,23 +18,33 @@ public class PushAttachmentPointer implements Parcelable {
};
private final String contentType;
- private final String key;
+ private final long id;
+ private final byte[] key;
- public PushAttachmentPointer(String contentType, String key) {
+ public PushAttachmentPointer(String contentType, long id, byte[] key) {
this.contentType = contentType;
+ this.id = id;
this.key = key;
}
public PushAttachmentPointer(Parcel in) {
this.contentType = in.readString();
- this.key = in.readString();
+ this.id = in.readLong();
+
+ int keyLength = in.readInt();
+ this.key = new byte[keyLength];
+ in.readByteArray(this.key);
}
public String getContentType() {
return contentType;
}
- public String getKey() {
+ public long getId() {
+ return id;
+ }
+
+ public byte[] getKey() {
return key;
}
@@ -46,6 +56,8 @@ public class PushAttachmentPointer implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(contentType);
- dest.writeString(key);
+ dest.writeLong(id);
+ dest.writeInt(this.key.length);
+ dest.writeByteArray(this.key);
}
}
diff --git a/library/src/org/whispersystems/textsecure/push/PushMessageProtos.java b/library/src/org/whispersystems/textsecure/push/PushMessageProtos.java
index ff79ffa74e..ca0179643d 100644
--- a/library/src/org/whispersystems/textsecure/push/PushMessageProtos.java
+++ b/library/src/org/whispersystems/textsecure/push/PushMessageProtos.java
@@ -24,23 +24,13 @@ public final class PushMessageProtos {
int getDestinationsCount();
String getDestinations(int index);
- // optional bytes message = 4;
- boolean hasMessage();
- com.google.protobuf.ByteString getMessage();
-
- // repeated .textsecure.IncomingPushMessageSignal.AttachmentPointer attachments = 5;
- java.util.List
- getAttachmentsList();
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer getAttachments(int index);
- int getAttachmentsCount();
- java.util.List
- getAttachmentsOrBuilderList();
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
- int index);
-
- // optional uint64 timestamp = 6;
+ // optional uint64 timestamp = 4;
boolean hasTimestamp();
long getTimestamp();
+
+ // optional bytes message = 5;
+ boolean hasMessage();
+ com.google.protobuf.ByteString getMessage();
}
public static final class IncomingPushMessageSignal extends
com.google.protobuf.GeneratedMessage
@@ -70,475 +60,6 @@ public final class PushMessageProtos {
return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_fieldAccessorTable;
}
- public interface AttachmentPointerOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
-
- // optional string contentType = 1;
- boolean hasContentType();
- String getContentType();
-
- // optional string key = 2;
- boolean hasKey();
- String getKey();
- }
- public static final class AttachmentPointer extends
- com.google.protobuf.GeneratedMessage
- implements AttachmentPointerOrBuilder {
- // Use AttachmentPointer.newBuilder() to construct.
- private AttachmentPointer(Builder builder) {
- super(builder);
- }
- private AttachmentPointer(boolean noInit) {}
-
- private static final AttachmentPointer defaultInstance;
- public static AttachmentPointer getDefaultInstance() {
- return defaultInstance;
- }
-
- public AttachmentPointer getDefaultInstanceForType() {
- return defaultInstance;
- }
-
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_AttachmentPointer_descriptor;
- }
-
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_AttachmentPointer_fieldAccessorTable;
- }
-
- private int bitField0_;
- // optional string contentType = 1;
- public static final int CONTENTTYPE_FIELD_NUMBER = 1;
- private java.lang.Object contentType_;
- public boolean hasContentType() {
- return ((bitField0_ & 0x00000001) == 0x00000001);
- }
- public String getContentType() {
- java.lang.Object ref = contentType_;
- if (ref instanceof String) {
- return (String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- String s = bs.toStringUtf8();
- if (com.google.protobuf.Internal.isValidUtf8(bs)) {
- contentType_ = s;
- }
- return s;
- }
- }
- private com.google.protobuf.ByteString getContentTypeBytes() {
- java.lang.Object ref = contentType_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((String) ref);
- contentType_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- // optional string key = 2;
- public static final int KEY_FIELD_NUMBER = 2;
- private java.lang.Object key_;
- public boolean hasKey() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- public String getKey() {
- java.lang.Object ref = key_;
- if (ref instanceof String) {
- return (String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- String s = bs.toStringUtf8();
- if (com.google.protobuf.Internal.isValidUtf8(bs)) {
- key_ = s;
- }
- return s;
- }
- }
- private com.google.protobuf.ByteString getKeyBytes() {
- java.lang.Object ref = key_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((String) ref);
- key_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- private void initFields() {
- contentType_ = "";
- key_ = "";
- }
- 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, getContentTypeBytes());
- }
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeBytes(2, getKeyBytes());
- }
- 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, getContentTypeBytes());
- }
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(2, getKeyBytes());
- }
- 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.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return newBuilder().mergeFrom(data).buildParsed();
- }
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return newBuilder().mergeFrom(data, extensionRegistry)
- .buildParsed();
- }
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return newBuilder().mergeFrom(data).buildParsed();
- }
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseFrom(
- byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return newBuilder().mergeFrom(data, extensionRegistry)
- .buildParsed();
- }
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return newBuilder().mergeFrom(input).buildParsed();
- }
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return newBuilder().mergeFrom(input, extensionRegistry)
- .buildParsed();
- }
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseDelimitedFrom(java.io.InputStream input)
- throws java.io.IOException {
- Builder builder = newBuilder();
- if (builder.mergeDelimitedFrom(input)) {
- return builder.buildParsed();
- } else {
- return null;
- }
- }
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseDelimitedFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- Builder builder = newBuilder();
- if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
- return builder.buildParsed();
- } else {
- return null;
- }
- }
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseFrom(
- com.google.protobuf.CodedInputStream input)
- throws java.io.IOException {
- return newBuilder().mergeFrom(input).buildParsed();
- }
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return newBuilder().mergeFrom(input, extensionRegistry)
- .buildParsed();
- }
-
- public static Builder newBuilder() { return Builder.create(); }
- public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer 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;
- }
- public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder
- implements org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointerOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_AttachmentPointer_descriptor;
- }
-
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_AttachmentPointer_fieldAccessorTable;
- }
-
- // Construct using org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(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();
- contentType_ = "";
- bitField0_ = (bitField0_ & ~0x00000001);
- key_ = "";
- bitField0_ = (bitField0_ & ~0x00000002);
- return this;
- }
-
- public Builder clone() {
- return create().mergeFrom(buildPartial());
- }
-
- public com.google.protobuf.Descriptors.Descriptor
- getDescriptorForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.getDescriptor();
- }
-
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer getDefaultInstanceForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.getDefaultInstance();
- }
-
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer build() {
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- private org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer buildParsed()
- throws com.google.protobuf.InvalidProtocolBufferException {
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(
- result).asInvalidProtocolBufferException();
- }
- return result;
- }
-
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer buildPartial() {
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer result = new org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer(this);
- int from_bitField0_ = bitField0_;
- int to_bitField0_ = 0;
- if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
- to_bitField0_ |= 0x00000001;
- }
- result.contentType_ = contentType_;
- if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
- to_bitField0_ |= 0x00000002;
- }
- result.key_ = key_;
- result.bitField0_ = to_bitField0_;
- onBuilt();
- return result;
- }
-
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer) {
- return mergeFrom((org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer)other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer other) {
- if (other == org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.getDefaultInstance()) return this;
- if (other.hasContentType()) {
- setContentType(other.getContentType());
- }
- if (other.hasKey()) {
- setKey(other.getKey());
- }
- 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 {
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder(
- this.getUnknownFields());
- while (true) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- this.setUnknownFields(unknownFields.build());
- onChanged();
- return this;
- default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
- this.setUnknownFields(unknownFields.build());
- onChanged();
- return this;
- }
- break;
- }
- case 10: {
- bitField0_ |= 0x00000001;
- contentType_ = input.readBytes();
- break;
- }
- case 18: {
- bitField0_ |= 0x00000002;
- key_ = input.readBytes();
- break;
- }
- }
- }
- }
-
- private int bitField0_;
-
- // optional string contentType = 1;
- private java.lang.Object contentType_ = "";
- public boolean hasContentType() {
- return ((bitField0_ & 0x00000001) == 0x00000001);
- }
- public String getContentType() {
- java.lang.Object ref = contentType_;
- if (!(ref instanceof String)) {
- String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
- contentType_ = s;
- return s;
- } else {
- return (String) ref;
- }
- }
- public Builder setContentType(String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000001;
- contentType_ = value;
- onChanged();
- return this;
- }
- public Builder clearContentType() {
- bitField0_ = (bitField0_ & ~0x00000001);
- contentType_ = getDefaultInstance().getContentType();
- onChanged();
- return this;
- }
- void setContentType(com.google.protobuf.ByteString value) {
- bitField0_ |= 0x00000001;
- contentType_ = value;
- onChanged();
- }
-
- // optional string key = 2;
- private java.lang.Object key_ = "";
- public boolean hasKey() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- public String getKey() {
- java.lang.Object ref = key_;
- if (!(ref instanceof String)) {
- String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
- key_ = s;
- return s;
- } else {
- return (String) ref;
- }
- }
- public Builder setKey(String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- key_ = value;
- onChanged();
- return this;
- }
- public Builder clearKey() {
- bitField0_ = (bitField0_ & ~0x00000002);
- key_ = getDefaultInstance().getKey();
- onChanged();
- return this;
- }
- void setKey(com.google.protobuf.ByteString value) {
- bitField0_ |= 0x00000002;
- key_ = value;
- onChanged();
- }
-
- // @@protoc_insertion_point(builder_scope:textsecure.IncomingPushMessageSignal.AttachmentPointer)
- }
-
- static {
- defaultInstance = new AttachmentPointer(true);
- defaultInstance.initFields();
- }
-
- // @@protoc_insertion_point(class_scope:textsecure.IncomingPushMessageSignal.AttachmentPointer)
- }
-
private int bitField0_;
// optional uint32 type = 1;
public static final int TYPE_FIELD_NUMBER = 1;
@@ -596,54 +117,32 @@ public final class PushMessageProtos {
return destinations_.get(index);
}
- // optional bytes message = 4;
- public static final int MESSAGE_FIELD_NUMBER = 4;
- private com.google.protobuf.ByteString message_;
- public boolean hasMessage() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
- }
- public com.google.protobuf.ByteString getMessage() {
- return message_;
- }
-
- // repeated .textsecure.IncomingPushMessageSignal.AttachmentPointer attachments = 5;
- public static final int ATTACHMENTS_FIELD_NUMBER = 5;
- private java.util.List attachments_;
- public java.util.List getAttachmentsList() {
- return attachments_;
- }
- public java.util.List
- getAttachmentsOrBuilderList() {
- return attachments_;
- }
- public int getAttachmentsCount() {
- return attachments_.size();
- }
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer getAttachments(int index) {
- return attachments_.get(index);
- }
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
- int index) {
- return attachments_.get(index);
- }
-
- // optional uint64 timestamp = 6;
- public static final int TIMESTAMP_FIELD_NUMBER = 6;
+ // optional uint64 timestamp = 4;
+ public static final int TIMESTAMP_FIELD_NUMBER = 4;
private long timestamp_;
public boolean hasTimestamp() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
public long getTimestamp() {
return timestamp_;
}
+ // optional bytes message = 5;
+ public static final int MESSAGE_FIELD_NUMBER = 5;
+ private com.google.protobuf.ByteString message_;
+ public boolean hasMessage() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ public com.google.protobuf.ByteString getMessage() {
+ return message_;
+ }
+
private void initFields() {
type_ = 0;
source_ = "";
destinations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- message_ = com.google.protobuf.ByteString.EMPTY;
- attachments_ = java.util.Collections.emptyList();
timestamp_ = 0L;
+ message_ = com.google.protobuf.ByteString.EMPTY;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -667,13 +166,10 @@ public final class PushMessageProtos {
output.writeBytes(3, destinations_.getByteString(i));
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- output.writeBytes(4, message_);
- }
- for (int i = 0; i < attachments_.size(); i++) {
- output.writeMessage(5, attachments_.get(i));
+ output.writeUInt64(4, timestamp_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- output.writeUInt64(6, timestamp_);
+ output.writeBytes(5, message_);
}
getUnknownFields().writeTo(output);
}
@@ -703,15 +199,11 @@ public final class PushMessageProtos {
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(4, message_);
- }
- for (int i = 0; i < attachments_.size(); i++) {
- size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(5, attachments_.get(i));
+ .computeUInt64Size(4, timestamp_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(6, timestamp_);
+ .computeBytesSize(5, message_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -829,7 +321,6 @@ public final class PushMessageProtos {
}
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
- getAttachmentsFieldBuilder();
}
}
private static Builder create() {
@@ -844,16 +335,10 @@ public final class PushMessageProtos {
bitField0_ = (bitField0_ & ~0x00000002);
destinations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000004);
- message_ = com.google.protobuf.ByteString.EMPTY;
- bitField0_ = (bitField0_ & ~0x00000008);
- if (attachmentsBuilder_ == null) {
- attachments_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
- } else {
- attachmentsBuilder_.clear();
- }
timestamp_ = 0L;
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000008);
+ message_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -909,20 +394,11 @@ public final class PushMessageProtos {
if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
to_bitField0_ |= 0x00000004;
}
- result.message_ = message_;
- if (attachmentsBuilder_ == null) {
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
- attachments_ = java.util.Collections.unmodifiableList(attachments_);
- bitField0_ = (bitField0_ & ~0x00000010);
- }
- result.attachments_ = attachments_;
- } else {
- result.attachments_ = attachmentsBuilder_.build();
- }
- if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+ result.timestamp_ = timestamp_;
+ if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
to_bitField0_ |= 0x00000008;
}
- result.timestamp_ = timestamp_;
+ result.message_ = message_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -955,38 +431,12 @@ public final class PushMessageProtos {
}
onChanged();
}
- if (other.hasMessage()) {
- setMessage(other.getMessage());
- }
- if (attachmentsBuilder_ == null) {
- if (!other.attachments_.isEmpty()) {
- if (attachments_.isEmpty()) {
- attachments_ = other.attachments_;
- bitField0_ = (bitField0_ & ~0x00000010);
- } else {
- ensureAttachmentsIsMutable();
- attachments_.addAll(other.attachments_);
- }
- onChanged();
- }
- } else {
- if (!other.attachments_.isEmpty()) {
- if (attachmentsBuilder_.isEmpty()) {
- attachmentsBuilder_.dispose();
- attachmentsBuilder_ = null;
- attachments_ = other.attachments_;
- bitField0_ = (bitField0_ & ~0x00000010);
- attachmentsBuilder_ =
- com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
- getAttachmentsFieldBuilder() : null;
- } else {
- attachmentsBuilder_.addAllMessages(other.attachments_);
- }
- }
- }
if (other.hasTimestamp()) {
setTimestamp(other.getTimestamp());
}
+ if (other.hasMessage()) {
+ setMessage(other.getMessage());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -1033,20 +483,14 @@ public final class PushMessageProtos {
destinations_.add(input.readBytes());
break;
}
- case 34: {
+ case 32: {
bitField0_ |= 0x00000008;
- message_ = input.readBytes();
+ timestamp_ = input.readUInt64();
break;
}
case 42: {
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder subBuilder = org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.newBuilder();
- input.readMessage(subBuilder, extensionRegistry);
- addAttachments(subBuilder.buildPartial());
- break;
- }
- case 48: {
- bitField0_ |= 0x00000020;
- timestamp_ = input.readUInt64();
+ bitField0_ |= 0x00000010;
+ message_ = input.readBytes();
break;
}
}
@@ -1168,10 +612,31 @@ public final class PushMessageProtos {
onChanged();
}
- // optional bytes message = 4;
+ // optional uint64 timestamp = 4;
+ private long timestamp_ ;
+ public boolean hasTimestamp() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ public long getTimestamp() {
+ return timestamp_;
+ }
+ public Builder setTimestamp(long value) {
+ bitField0_ |= 0x00000008;
+ timestamp_ = value;
+ onChanged();
+ return this;
+ }
+ public Builder clearTimestamp() {
+ bitField0_ = (bitField0_ & ~0x00000008);
+ timestamp_ = 0L;
+ onChanged();
+ return this;
+ }
+
+ // optional bytes message = 5;
private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasMessage() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
public com.google.protobuf.ByteString getMessage() {
return message_;
@@ -1180,32 +645,986 @@ public final class PushMessageProtos {
if (value == null) {
throw new NullPointerException();
}
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
message_ = value;
onChanged();
return this;
}
public Builder clearMessage() {
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000010);
message_ = getDefaultInstance().getMessage();
onChanged();
return this;
}
- // repeated .textsecure.IncomingPushMessageSignal.AttachmentPointer attachments = 5;
- private java.util.List attachments_ =
+ // @@protoc_insertion_point(builder_scope:textsecure.IncomingPushMessageSignal)
+ }
+
+ static {
+ defaultInstance = new IncomingPushMessageSignal(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:textsecure.IncomingPushMessageSignal)
+ }
+
+ public interface PushMessageContentOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // optional string body = 1;
+ boolean hasBody();
+ String getBody();
+
+ // repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
+ java.util.List
+ getAttachmentsList();
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAttachments(int index);
+ int getAttachmentsCount();
+ java.util.List
+ getAttachmentsOrBuilderList();
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
+ int index);
+ }
+ public static final class PushMessageContent extends
+ com.google.protobuf.GeneratedMessage
+ implements PushMessageContentOrBuilder {
+ // Use PushMessageContent.newBuilder() to construct.
+ private PushMessageContent(Builder builder) {
+ super(builder);
+ }
+ private PushMessageContent(boolean noInit) {}
+
+ private static final PushMessageContent defaultInstance;
+ public static PushMessageContent getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public PushMessageContent getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_fieldAccessorTable;
+ }
+
+ public interface AttachmentPointerOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // optional fixed64 id = 1;
+ boolean hasId();
+ long getId();
+
+ // optional string contentType = 2;
+ boolean hasContentType();
+ String getContentType();
+
+ // optional bytes key = 3;
+ boolean hasKey();
+ com.google.protobuf.ByteString getKey();
+ }
+ public static final class AttachmentPointer extends
+ com.google.protobuf.GeneratedMessage
+ implements AttachmentPointerOrBuilder {
+ // Use AttachmentPointer.newBuilder() to construct.
+ private AttachmentPointer(Builder builder) {
+ super(builder);
+ }
+ private AttachmentPointer(boolean noInit) {}
+
+ private static final AttachmentPointer defaultInstance;
+ public static AttachmentPointer getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public AttachmentPointer getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable;
+ }
+
+ private int bitField0_;
+ // optional fixed64 id = 1;
+ public static final int ID_FIELD_NUMBER = 1;
+ private long id_;
+ public boolean hasId() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public long getId() {
+ return id_;
+ }
+
+ // optional string contentType = 2;
+ public static final int CONTENTTYPE_FIELD_NUMBER = 2;
+ private java.lang.Object contentType_;
+ public boolean hasContentType() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public String getContentType() {
+ java.lang.Object ref = contentType_;
+ if (ref instanceof String) {
+ return (String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+ contentType_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getContentTypeBytes() {
+ java.lang.Object ref = contentType_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ contentType_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ // optional bytes key = 3;
+ public static final int KEY_FIELD_NUMBER = 3;
+ private com.google.protobuf.ByteString key_;
+ public boolean hasKey() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ public com.google.protobuf.ByteString getKey() {
+ return key_;
+ }
+
+ private void initFields() {
+ id_ = 0L;
+ contentType_ = "";
+ key_ = com.google.protobuf.ByteString.EMPTY;
+ }
+ 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.writeFixed64(1, id_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBytes(2, getContentTypeBytes());
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeBytes(3, key_);
+ }
+ 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
+ .computeFixed64Size(1, id_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBytesSize(2, getContentTypeBytes());
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBytesSize(3, key_);
+ }
+ 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.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data).buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data, extensionRegistry)
+ .buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data).buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data, extensionRegistry)
+ .buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input).buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input, extensionRegistry)
+ .buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ Builder builder = newBuilder();
+ if (builder.mergeDelimitedFrom(input)) {
+ return builder.buildParsed();
+ } else {
+ return null;
+ }
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ Builder builder = newBuilder();
+ if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+ return builder.buildParsed();
+ } else {
+ return null;
+ }
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input).buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input, extensionRegistry)
+ .buildParsed();
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer 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;
+ }
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessage.Builder
+ implements org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable;
+ }
+
+ // Construct using org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(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();
+ id_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ contentType_ = "";
+ bitField0_ = (bitField0_ & ~0x00000002);
+ key_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ return this;
+ }
+
+ public Builder clone() {
+ return create().mergeFrom(buildPartial());
+ }
+
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDescriptor();
+ }
+
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getDefaultInstanceForType() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
+ }
+
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer build() {
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ private org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer buildParsed()
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(
+ result).asInvalidProtocolBufferException();
+ }
+ return result;
+ }
+
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer buildPartial() {
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer result = new org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.id_ = id_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.contentType_ = contentType_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.key_ = key_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
+ }
+
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer) {
+ return mergeFrom((org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer other) {
+ if (other == org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance()) return this;
+ if (other.hasId()) {
+ setId(other.getId());
+ }
+ if (other.hasContentType()) {
+ setContentType(other.getContentType());
+ }
+ if (other.hasKey()) {
+ setKey(other.getKey());
+ }
+ 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 {
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder(
+ this.getUnknownFields());
+ while (true) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ this.setUnknownFields(unknownFields.build());
+ onChanged();
+ return this;
+ default: {
+ if (!parseUnknownField(input, unknownFields,
+ extensionRegistry, tag)) {
+ this.setUnknownFields(unknownFields.build());
+ onChanged();
+ return this;
+ }
+ break;
+ }
+ case 9: {
+ bitField0_ |= 0x00000001;
+ id_ = input.readFixed64();
+ break;
+ }
+ case 18: {
+ bitField0_ |= 0x00000002;
+ contentType_ = input.readBytes();
+ break;
+ }
+ case 26: {
+ bitField0_ |= 0x00000004;
+ key_ = input.readBytes();
+ break;
+ }
+ }
+ }
+ }
+
+ private int bitField0_;
+
+ // optional fixed64 id = 1;
+ private long id_ ;
+ public boolean hasId() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public long getId() {
+ return id_;
+ }
+ public Builder setId(long value) {
+ bitField0_ |= 0x00000001;
+ id_ = value;
+ onChanged();
+ return this;
+ }
+ public Builder clearId() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ id_ = 0L;
+ onChanged();
+ return this;
+ }
+
+ // optional string contentType = 2;
+ private java.lang.Object contentType_ = "";
+ public boolean hasContentType() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public String getContentType() {
+ java.lang.Object ref = contentType_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ contentType_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
+ }
+ public Builder setContentType(String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000002;
+ contentType_ = value;
+ onChanged();
+ return this;
+ }
+ public Builder clearContentType() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ contentType_ = getDefaultInstance().getContentType();
+ onChanged();
+ return this;
+ }
+ void setContentType(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000002;
+ contentType_ = value;
+ onChanged();
+ }
+
+ // optional bytes key = 3;
+ private com.google.protobuf.ByteString key_ = com.google.protobuf.ByteString.EMPTY;
+ public boolean hasKey() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ public com.google.protobuf.ByteString getKey() {
+ return key_;
+ }
+ public Builder setKey(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000004;
+ key_ = value;
+ onChanged();
+ return this;
+ }
+ public Builder clearKey() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ key_ = getDefaultInstance().getKey();
+ onChanged();
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:textsecure.PushMessageContent.AttachmentPointer)
+ }
+
+ static {
+ defaultInstance = new AttachmentPointer(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:textsecure.PushMessageContent.AttachmentPointer)
+ }
+
+ private int bitField0_;
+ // optional string body = 1;
+ public static final int BODY_FIELD_NUMBER = 1;
+ private java.lang.Object body_;
+ public boolean hasBody() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public String getBody() {
+ java.lang.Object ref = body_;
+ if (ref instanceof String) {
+ return (String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+ body_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getBodyBytes() {
+ java.lang.Object ref = body_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ body_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ // repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
+ public static final int ATTACHMENTS_FIELD_NUMBER = 2;
+ private java.util.List attachments_;
+ public java.util.List getAttachmentsList() {
+ return attachments_;
+ }
+ public java.util.List
+ getAttachmentsOrBuilderList() {
+ return attachments_;
+ }
+ public int getAttachmentsCount() {
+ return attachments_.size();
+ }
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAttachments(int index) {
+ return attachments_.get(index);
+ }
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
+ int index) {
+ return attachments_.get(index);
+ }
+
+ private void initFields() {
+ body_ = "";
+ attachments_ = java.util.Collections.emptyList();
+ }
+ 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, getBodyBytes());
+ }
+ for (int i = 0; i < attachments_.size(); i++) {
+ output.writeMessage(2, attachments_.get(i));
+ }
+ 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, getBodyBytes());
+ }
+ for (int i = 0; i < attachments_.size(); i++) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(2, attachments_.get(i));
+ }
+ 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.push.PushMessageProtos.PushMessageContent parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data).buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data, extensionRegistry)
+ .buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data).buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return newBuilder().mergeFrom(data, extensionRegistry)
+ .buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input).buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input, extensionRegistry)
+ .buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ Builder builder = newBuilder();
+ if (builder.mergeDelimitedFrom(input)) {
+ return builder.buildParsed();
+ } else {
+ return null;
+ }
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ Builder builder = newBuilder();
+ if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+ return builder.buildParsed();
+ } else {
+ return null;
+ }
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input).buildParsed();
+ }
+ public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return newBuilder().mergeFrom(input, extensionRegistry)
+ .buildParsed();
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent 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;
+ }
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessage.Builder
+ implements org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContentOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_fieldAccessorTable;
+ }
+
+ // Construct using org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getAttachmentsFieldBuilder();
+ }
+ }
+ private static Builder create() {
+ return new Builder();
+ }
+
+ public Builder clear() {
+ super.clear();
+ body_ = "";
+ bitField0_ = (bitField0_ & ~0x00000001);
+ if (attachmentsBuilder_ == null) {
+ attachments_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000002);
+ } else {
+ attachmentsBuilder_.clear();
+ }
+ return this;
+ }
+
+ public Builder clone() {
+ return create().mergeFrom(buildPartial());
+ }
+
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.getDescriptor();
+ }
+
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent getDefaultInstanceForType() {
+ return org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.getDefaultInstance();
+ }
+
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent build() {
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ private org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent buildParsed()
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(
+ result).asInvalidProtocolBufferException();
+ }
+ return result;
+ }
+
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent buildPartial() {
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent result = new org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.body_ = body_;
+ if (attachmentsBuilder_ == null) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ attachments_ = java.util.Collections.unmodifiableList(attachments_);
+ bitField0_ = (bitField0_ & ~0x00000002);
+ }
+ result.attachments_ = attachments_;
+ } else {
+ result.attachments_ = attachmentsBuilder_.build();
+ }
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
+ }
+
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent) {
+ return mergeFrom((org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent other) {
+ if (other == org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.getDefaultInstance()) return this;
+ if (other.hasBody()) {
+ setBody(other.getBody());
+ }
+ if (attachmentsBuilder_ == null) {
+ if (!other.attachments_.isEmpty()) {
+ if (attachments_.isEmpty()) {
+ attachments_ = other.attachments_;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ } else {
+ ensureAttachmentsIsMutable();
+ attachments_.addAll(other.attachments_);
+ }
+ onChanged();
+ }
+ } else {
+ if (!other.attachments_.isEmpty()) {
+ if (attachmentsBuilder_.isEmpty()) {
+ attachmentsBuilder_.dispose();
+ attachmentsBuilder_ = null;
+ attachments_ = other.attachments_;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ attachmentsBuilder_ =
+ com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+ getAttachmentsFieldBuilder() : null;
+ } else {
+ attachmentsBuilder_.addAllMessages(other.attachments_);
+ }
+ }
+ }
+ 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 {
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder(
+ this.getUnknownFields());
+ while (true) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ this.setUnknownFields(unknownFields.build());
+ onChanged();
+ return this;
+ default: {
+ if (!parseUnknownField(input, unknownFields,
+ extensionRegistry, tag)) {
+ this.setUnknownFields(unknownFields.build());
+ onChanged();
+ return this;
+ }
+ break;
+ }
+ case 10: {
+ bitField0_ |= 0x00000001;
+ body_ = input.readBytes();
+ break;
+ }
+ case 18: {
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder subBuilder = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.newBuilder();
+ input.readMessage(subBuilder, extensionRegistry);
+ addAttachments(subBuilder.buildPartial());
+ break;
+ }
+ }
+ }
+ }
+
+ private int bitField0_;
+
+ // optional string body = 1;
+ private java.lang.Object body_ = "";
+ public boolean hasBody() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public String getBody() {
+ java.lang.Object ref = body_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ body_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
+ }
+ public Builder setBody(String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000001;
+ body_ = value;
+ onChanged();
+ return this;
+ }
+ public Builder clearBody() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ body_ = getDefaultInstance().getBody();
+ onChanged();
+ return this;
+ }
+ void setBody(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000001;
+ body_ = value;
+ onChanged();
+ }
+
+ // repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
+ private java.util.List attachments_ =
java.util.Collections.emptyList();
private void ensureAttachmentsIsMutable() {
- if (!((bitField0_ & 0x00000010) == 0x00000010)) {
- attachments_ = new java.util.ArrayList(attachments_);
- bitField0_ |= 0x00000010;
+ if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+ attachments_ = new java.util.ArrayList(attachments_);
+ bitField0_ |= 0x00000002;
}
}
private com.google.protobuf.RepeatedFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointerOrBuilder> attachmentsBuilder_;
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder> attachmentsBuilder_;
- public java.util.List getAttachmentsList() {
+ public java.util.List getAttachmentsList() {
if (attachmentsBuilder_ == null) {
return java.util.Collections.unmodifiableList(attachments_);
} else {
@@ -1219,7 +1638,7 @@ public final class PushMessageProtos {
return attachmentsBuilder_.getCount();
}
}
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer getAttachments(int index) {
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAttachments(int index) {
if (attachmentsBuilder_ == null) {
return attachments_.get(index);
} else {
@@ -1227,7 +1646,7 @@ public final class PushMessageProtos {
}
}
public Builder setAttachments(
- int index, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer value) {
+ int index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
if (attachmentsBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -1241,7 +1660,7 @@ public final class PushMessageProtos {
return this;
}
public Builder setAttachments(
- int index, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder builderForValue) {
+ int index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
if (attachmentsBuilder_ == null) {
ensureAttachmentsIsMutable();
attachments_.set(index, builderForValue.build());
@@ -1251,7 +1670,7 @@ public final class PushMessageProtos {
}
return this;
}
- public Builder addAttachments(org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer value) {
+ public Builder addAttachments(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
if (attachmentsBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -1265,7 +1684,7 @@ public final class PushMessageProtos {
return this;
}
public Builder addAttachments(
- int index, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer value) {
+ int index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
if (attachmentsBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -1279,7 +1698,7 @@ public final class PushMessageProtos {
return this;
}
public Builder addAttachments(
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder builderForValue) {
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
if (attachmentsBuilder_ == null) {
ensureAttachmentsIsMutable();
attachments_.add(builderForValue.build());
@@ -1290,7 +1709,7 @@ public final class PushMessageProtos {
return this;
}
public Builder addAttachments(
- int index, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder builderForValue) {
+ int index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
if (attachmentsBuilder_ == null) {
ensureAttachmentsIsMutable();
attachments_.add(index, builderForValue.build());
@@ -1301,7 +1720,7 @@ public final class PushMessageProtos {
return this;
}
public Builder addAllAttachments(
- java.lang.Iterable values) {
+ java.lang.Iterable values) {
if (attachmentsBuilder_ == null) {
ensureAttachmentsIsMutable();
super.addAll(values, attachments_);
@@ -1314,7 +1733,7 @@ public final class PushMessageProtos {
public Builder clearAttachments() {
if (attachmentsBuilder_ == null) {
attachments_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
} else {
attachmentsBuilder_.clear();
@@ -1331,18 +1750,18 @@ public final class PushMessageProtos {
}
return this;
}
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder getAttachmentsBuilder(
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder getAttachmentsBuilder(
int index) {
return getAttachmentsFieldBuilder().getBuilder(index);
}
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
int index) {
if (attachmentsBuilder_ == null) {
return attachments_.get(index); } else {
return attachmentsBuilder_.getMessageOrBuilder(index);
}
}
- public java.util.List
+ public java.util.List
getAttachmentsOrBuilderList() {
if (attachmentsBuilder_ != null) {
return attachmentsBuilder_.getMessageOrBuilderList();
@@ -1350,27 +1769,27 @@ public final class PushMessageProtos {
return java.util.Collections.unmodifiableList(attachments_);
}
}
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder addAttachmentsBuilder() {
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder addAttachmentsBuilder() {
return getAttachmentsFieldBuilder().addBuilder(
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.getDefaultInstance());
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance());
}
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder addAttachmentsBuilder(
+ public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder addAttachmentsBuilder(
int index) {
return getAttachmentsFieldBuilder().addBuilder(
- index, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.getDefaultInstance());
+ index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance());
}
- public java.util.List
+ public java.util.List
getAttachmentsBuilderList() {
return getAttachmentsFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointerOrBuilder>
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>
getAttachmentsFieldBuilder() {
if (attachmentsBuilder_ == null) {
attachmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointerOrBuilder>(
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>(
attachments_,
- ((bitField0_ & 0x00000010) == 0x00000010),
+ ((bitField0_ & 0x00000002) == 0x00000002),
getParentForChildren(),
isClean());
attachments_ = null;
@@ -1378,36 +1797,15 @@ public final class PushMessageProtos {
return attachmentsBuilder_;
}
- // optional uint64 timestamp = 6;
- private long timestamp_ ;
- public boolean hasTimestamp() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
- }
- public long getTimestamp() {
- return timestamp_;
- }
- public Builder setTimestamp(long value) {
- bitField0_ |= 0x00000020;
- timestamp_ = value;
- onChanged();
- return this;
- }
- public Builder clearTimestamp() {
- bitField0_ = (bitField0_ & ~0x00000020);
- timestamp_ = 0L;
- onChanged();
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:textsecure.IncomingPushMessageSignal)
+ // @@protoc_insertion_point(builder_scope:textsecure.PushMessageContent)
}
static {
- defaultInstance = new IncomingPushMessageSignal(true);
+ defaultInstance = new PushMessageContent(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:textsecure.IncomingPushMessageSignal)
+ // @@protoc_insertion_point(class_scope:textsecure.PushMessageContent)
}
private static com.google.protobuf.Descriptors.Descriptor
@@ -1416,10 +1814,15 @@ public final class PushMessageProtos {
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_textsecure_IncomingPushMessageSignal_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
- internal_static_textsecure_IncomingPushMessageSignal_AttachmentPointer_descriptor;
+ internal_static_textsecure_PushMessageContent_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_textsecure_IncomingPushMessageSignal_AttachmentPointer_fieldAccessorTable;
+ internal_static_textsecure_PushMessageContent_fieldAccessorTable;
+ private static com.google.protobuf.Descriptors.Descriptor
+ internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor;
+ private static
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@@ -1430,14 +1833,15 @@ public final class PushMessageProtos {
static {
java.lang.String[] descriptorData = {
"\n\037IncomingPushMessageSignal.proto\022\ntexts" +
- "ecure\"\370\001\n\031IncomingPushMessageSignal\022\014\n\004t" +
- "ype\030\001 \001(\r\022\016\n\006source\030\002 \001(\t\022\024\n\014destination" +
- "s\030\003 \003(\t\022\017\n\007message\030\004 \001(\014\022L\n\013attachments\030" +
- "\005 \003(\01327.textsecure.IncomingPushMessageSi" +
- "gnal.AttachmentPointer\022\021\n\ttimestamp\030\006 \001(" +
- "\004\0325\n\021AttachmentPointer\022\023\n\013contentType\030\001 " +
- "\001(\t\022\013\n\003key\030\002 \001(\tB7\n\"org.whispersystems.t" +
- "extsecure.pushB\021PushMessageProtos"
+ "ecure\"s\n\031IncomingPushMessageSignal\022\014\n\004ty" +
+ "pe\030\001 \001(\r\022\016\n\006source\030\002 \001(\t\022\024\n\014destinations" +
+ "\030\003 \003(\t\022\021\n\ttimestamp\030\004 \001(\004\022\017\n\007message\030\005 \001" +
+ "(\014\"\254\001\n\022PushMessageContent\022\014\n\004body\030\001 \001(\t\022" +
+ "E\n\013attachments\030\002 \003(\01320.textsecure.PushMe" +
+ "ssageContent.AttachmentPointer\032A\n\021Attach" +
+ "mentPointer\022\n\n\002id\030\001 \001(\006\022\023\n\013contentType\030\002" +
+ " \001(\t\022\013\n\003key\030\003 \001(\014B7\n\"org.whispersystems." +
+ "textsecure.pushB\021PushMessageProtos"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -1449,17 +1853,25 @@ public final class PushMessageProtos {
internal_static_textsecure_IncomingPushMessageSignal_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_textsecure_IncomingPushMessageSignal_descriptor,
- new java.lang.String[] { "Type", "Source", "Destinations", "Message", "Attachments", "Timestamp", },
+ new java.lang.String[] { "Type", "Source", "Destinations", "Timestamp", "Message", },
org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.class,
org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Builder.class);
- internal_static_textsecure_IncomingPushMessageSignal_AttachmentPointer_descriptor =
- internal_static_textsecure_IncomingPushMessageSignal_descriptor.getNestedTypes().get(0);
- internal_static_textsecure_IncomingPushMessageSignal_AttachmentPointer_fieldAccessorTable = new
+ internal_static_textsecure_PushMessageContent_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_textsecure_PushMessageContent_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_textsecure_IncomingPushMessageSignal_AttachmentPointer_descriptor,
- new java.lang.String[] { "ContentType", "Key", },
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.class,
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.AttachmentPointer.Builder.class);
+ internal_static_textsecure_PushMessageContent_descriptor,
+ new java.lang.String[] { "Body", "Attachments", },
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.class,
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.Builder.class);
+ internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor =
+ internal_static_textsecure_PushMessageContent_descriptor.getNestedTypes().get(0);
+ internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor,
+ new java.lang.String[] { "Id", "ContentType", "Key", },
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.class,
+ org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder.class);
return null;
}
};
diff --git a/library/src/org/whispersystems/textsecure/push/PushServiceSocket.java b/library/src/org/whispersystems/textsecure/push/PushServiceSocket.java
index acde1f67c1..bee4cd9235 100644
--- a/library/src/org/whispersystems/textsecure/push/PushServiceSocket.java
+++ b/library/src/org/whispersystems/textsecure/push/PushServiceSocket.java
@@ -84,31 +84,21 @@ public class PushServiceSocket {
sendMessage(new OutgoingPushMessageList(message));
}
- public void sendMessage(List recipients, List bodies,
- List> attachmentsList, int type)
+ public void sendMessage(List recipients, List bodies, List types)
throws IOException
{
List messages = new LinkedList();
- Iterator recipientsIterator = recipients.iterator();
- Iterator bodiesIterator = bodies.iterator();
- Iterator> attachmentsIterator = attachmentsList.iterator();
+ Iterator recipientsIterator = recipients.iterator();
+ Iterator bodiesIterator = bodies.iterator();
+ Iterator typesIterator = types.iterator();
while (recipientsIterator.hasNext()) {
- String recipient = recipientsIterator.next();
- byte[] body = bodiesIterator.next();
- List attachments = attachmentsIterator.next();
+ String recipient = recipientsIterator.next();
+ byte[] body = bodiesIterator.next();
+ int type = typesIterator.next();
- OutgoingPushMessage message;
-
- if (!attachments.isEmpty()) {
- List attachmentIds = sendAttachments(attachments);
- message = new OutgoingPushMessage(recipient, body, attachmentIds, type);
- } else {
- message = new OutgoingPushMessage(recipient, body, type);
- }
-
- messages.add(message);
+ messages.add(new OutgoingPushMessage(recipient, body, type));
}
sendMessage(new OutgoingPushMessageList(messages));
@@ -149,20 +139,7 @@ public class PushServiceSocket {
return PreKeyEntity.fromJson(responseText);
}
- private List sendAttachments(List attachments)
- throws IOException
- {
- List attachmentIds = new LinkedList();
-
- for (PushAttachmentData attachment : attachments) {
- attachmentIds.add(new PushAttachmentPointer(attachment.getContentType(),
- sendAttachment(attachment)));
- }
-
- return attachmentIds;
- }
-
- private String sendAttachment(PushAttachmentData attachment) throws IOException {
+ public long sendAttachment(PushAttachmentData attachment) throws IOException {
Pair response = makeRequestForResponseHeader(String.format(ATTACHMENT_PATH, ""),
"GET", null, "Content-Location");
@@ -178,25 +155,18 @@ public class PushServiceSocket {
return new Gson().fromJson(response.second, AttachmentKey.class).getId();
}
- public List> retrieveAttachments(List attachmentIds)
- throws IOException
- {
- List> attachments = new LinkedList>();
+ public File retrieveAttachment(long attachmentId) throws IOException {
+ Pair response = makeRequestForResponseHeader(String.format(ATTACHMENT_PATH, String.valueOf(attachmentId)),
+ "GET", null, "Content-Location");
- for (PushAttachmentPointer attachmentId : attachmentIds) {
- Pair response = makeRequestForResponseHeader(String.format(ATTACHMENT_PATH, attachmentId.getKey()),
- "GET", null, "Content-Location");
+ Log.w("PushServiceSocket", "Attachment: " + attachmentId + " is at: " + response.first);
- Log.w("PushServiceSocket", "Attachment: " + attachmentId.getKey() + " is at: " + response.first);
+ File attachment = File.createTempFile("attachment", ".tmp", context.getFilesDir());
+ attachment.deleteOnExit();
- File attachment = File.createTempFile("attachment", ".tmp", context.getFilesDir());
- attachment.deleteOnExit();
+ downloadExternalFile(response.first, attachment);
- downloadExternalFile(response.first, attachment);
- attachments.add(new Pair(attachment, attachmentId.getContentType()));
- }
-
- return attachments;
+ return attachment;
}
public Pair retrieveDirectory() {
@@ -394,13 +364,13 @@ public class PushServiceSocket {
}
private static class AttachmentKey {
- private String id;
+ private long id;
- public AttachmentKey(String id) {
+ public AttachmentKey(long id) {
this.id = id;
}
- public String getId() {
+ public long getId() {
return id;
}
}
diff --git a/library/src/org/whispersystems/textsecure/util/Util.java b/library/src/org/whispersystems/textsecure/util/Util.java
index 379c250000..800050c631 100644
--- a/library/src/org/whispersystems/textsecure/util/Util.java
+++ b/library/src/org/whispersystems/textsecure/util/Util.java
@@ -45,6 +45,33 @@ public class Util {
}
+ public static byte[][] split(byte[] input, int firstLength, int secondLength) {
+ byte[][] parts = new byte[2][];
+
+ parts[0] = new byte[firstLength];
+ System.arraycopy(input, 0, parts[0], 0, firstLength);
+
+ parts[1] = new byte[secondLength];
+ System.arraycopy(input, firstLength, parts[1], 0, secondLength);
+
+ return parts;
+ }
+
+ public static byte[][] split(byte[] input, int firstLength, int secondLength, int thirdLength) {
+ byte[][] parts = new byte[3][];
+
+ parts[0] = new byte[firstLength];
+ System.arraycopy(input, 0, parts[0], 0, firstLength);
+
+ parts[1] = new byte[secondLength];
+ System.arraycopy(input, firstLength, parts[1], 0, secondLength);
+
+ parts[2] = new byte[thirdLength];
+ System.arraycopy(input, firstLength + secondLength, parts[2], 0, thirdLength);
+
+ return parts;
+ }
+
public static boolean isEmpty(String value) {
return value == null || value.trim().length() == 0;
}
@@ -94,6 +121,18 @@ public class Util {
return new String(bout.toByteArray());
}
+ public static void readFully(InputStream in, byte[] buffer) throws IOException {
+ int offset = 0;
+
+ for (;;) {
+ int read = in.read(buffer, offset, buffer.length - offset);
+
+ if (read + offset < buffer.length) offset += read;
+ else return;
+ }
+ }
+
+
public static void copy(InputStream in, OutputStream out) throws IOException {
byte[] buffer = new byte[4096];
int read;
diff --git a/res/drawable-hdpi/stat_sys_download_anim0.png b/res/drawable-hdpi/stat_sys_download_anim0.png
new file mode 100644
index 0000000000..72d5f3fcb2
Binary files /dev/null and b/res/drawable-hdpi/stat_sys_download_anim0.png differ
diff --git a/res/drawable-hdpi/stat_sys_download_anim1.png b/res/drawable-hdpi/stat_sys_download_anim1.png
new file mode 100644
index 0000000000..e7ba0a5d0a
Binary files /dev/null and b/res/drawable-hdpi/stat_sys_download_anim1.png differ
diff --git a/res/drawable-hdpi/stat_sys_download_anim2.png b/res/drawable-hdpi/stat_sys_download_anim2.png
new file mode 100644
index 0000000000..972e50428f
Binary files /dev/null and b/res/drawable-hdpi/stat_sys_download_anim2.png differ
diff --git a/res/drawable-hdpi/stat_sys_download_anim3.png b/res/drawable-hdpi/stat_sys_download_anim3.png
new file mode 100644
index 0000000000..5a8d9d0d01
Binary files /dev/null and b/res/drawable-hdpi/stat_sys_download_anim3.png differ
diff --git a/res/drawable-hdpi/stat_sys_download_anim4.png b/res/drawable-hdpi/stat_sys_download_anim4.png
new file mode 100644
index 0000000000..98796a2606
Binary files /dev/null and b/res/drawable-hdpi/stat_sys_download_anim4.png differ
diff --git a/res/drawable-hdpi/stat_sys_download_anim5.png b/res/drawable-hdpi/stat_sys_download_anim5.png
new file mode 100644
index 0000000000..b82a689e07
Binary files /dev/null and b/res/drawable-hdpi/stat_sys_download_anim5.png differ
diff --git a/res/drawable-mdpi/stat_sys_download_anim0.png b/res/drawable-mdpi/stat_sys_download_anim0.png
new file mode 100644
index 0000000000..b14d0f671d
Binary files /dev/null and b/res/drawable-mdpi/stat_sys_download_anim0.png differ
diff --git a/res/drawable-mdpi/stat_sys_download_anim1.png b/res/drawable-mdpi/stat_sys_download_anim1.png
new file mode 100644
index 0000000000..7e002201a7
Binary files /dev/null and b/res/drawable-mdpi/stat_sys_download_anim1.png differ
diff --git a/res/drawable-mdpi/stat_sys_download_anim2.png b/res/drawable-mdpi/stat_sys_download_anim2.png
new file mode 100644
index 0000000000..941839935a
Binary files /dev/null and b/res/drawable-mdpi/stat_sys_download_anim2.png differ
diff --git a/res/drawable-mdpi/stat_sys_download_anim3.png b/res/drawable-mdpi/stat_sys_download_anim3.png
new file mode 100644
index 0000000000..84a9362a47
Binary files /dev/null and b/res/drawable-mdpi/stat_sys_download_anim3.png differ
diff --git a/res/drawable-mdpi/stat_sys_download_anim4.png b/res/drawable-mdpi/stat_sys_download_anim4.png
new file mode 100644
index 0000000000..8fdc8716d6
Binary files /dev/null and b/res/drawable-mdpi/stat_sys_download_anim4.png differ
diff --git a/res/drawable-mdpi/stat_sys_download_anim5.png b/res/drawable-mdpi/stat_sys_download_anim5.png
new file mode 100644
index 0000000000..6b64abd82b
Binary files /dev/null and b/res/drawable-mdpi/stat_sys_download_anim5.png differ
diff --git a/res/drawable-xhdpi/stat_sys_download_anim0.png b/res/drawable-xhdpi/stat_sys_download_anim0.png
new file mode 100644
index 0000000000..f465442a89
Binary files /dev/null and b/res/drawable-xhdpi/stat_sys_download_anim0.png differ
diff --git a/res/drawable-xhdpi/stat_sys_download_anim1.png b/res/drawable-xhdpi/stat_sys_download_anim1.png
new file mode 100644
index 0000000000..15d1a487be
Binary files /dev/null and b/res/drawable-xhdpi/stat_sys_download_anim1.png differ
diff --git a/res/drawable-xhdpi/stat_sys_download_anim2.png b/res/drawable-xhdpi/stat_sys_download_anim2.png
new file mode 100644
index 0000000000..3b47b47d7e
Binary files /dev/null and b/res/drawable-xhdpi/stat_sys_download_anim2.png differ
diff --git a/res/drawable-xhdpi/stat_sys_download_anim3.png b/res/drawable-xhdpi/stat_sys_download_anim3.png
new file mode 100644
index 0000000000..ecc2eef5d7
Binary files /dev/null and b/res/drawable-xhdpi/stat_sys_download_anim3.png differ
diff --git a/res/drawable-xhdpi/stat_sys_download_anim4.png b/res/drawable-xhdpi/stat_sys_download_anim4.png
new file mode 100644
index 0000000000..1014804a86
Binary files /dev/null and b/res/drawable-xhdpi/stat_sys_download_anim4.png differ
diff --git a/res/drawable-xhdpi/stat_sys_download_anim5.png b/res/drawable-xhdpi/stat_sys_download_anim5.png
new file mode 100644
index 0000000000..e3d4730ee7
Binary files /dev/null and b/res/drawable-xhdpi/stat_sys_download_anim5.png differ
diff --git a/res/drawable/stat_sys_download.xml b/res/drawable/stat_sys_download.xml
new file mode 100644
index 0000000000..77ecf8588b
--- /dev/null
+++ b/res/drawable/stat_sys_download.xml
@@ -0,0 +1,30 @@
+
+
+
+