Switch to protobuf enums for push signal type.

signalapp · Feb 15, 2014 · 9438973 · 9438973
1 parent 2f98622
commit 9438973
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 52 deletions.
diff --git a/library/protobuf/IncomingPushMessageSignal.proto b/library/protobuf/IncomingPushMessageSignal.proto
@@ -4,13 +4,21 @@ option java_package = "org.whispersystems.textsecure.push";
 option java_outer_classname = "PushMessageProtos";
 
 message IncomingPushMessageSignal {
-  optional uint32 type = 1;
-  optional string source = 2;
+  enum Type {
+    UNKNOWN       = 0;
+    CIPHERTEXT    = 1;
+    KEY_EXCHANGE  = 2;
+    PREKEY_BUNDLE = 3;
+    PLAINTEXT     = 4;
+    ADVISORY      = 5;
+  }
+  optional Type   type         = 1;
+  optional string source       = 2;
   optional uint32 sourceDevice = 7;
-  optional string relay = 3;
+  optional string relay        = 3;
+  optional uint64 timestamp    = 5;
+  optional bytes  message      = 6; // Contains an encrypted PushMessageContent
 //  repeated string destinations = 4; // No longer supported
-  optional uint64 timestamp = 5;
-  optional bytes message = 6; // Contains an encrypted PushMessageContent
 }
 
 message PushMessageContent {

diff --git a/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java b/library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java
@@ -52,7 +52,7 @@ private IncomingPushMessage(IncomingPushMessage message, byte[] body) {
   }
 
   public IncomingPushMessage(IncomingPushMessageSignal signal) {
-    this.type         = signal.getType();
+    this.type         = signal.getType().getNumber();
     this.source       = signal.getSource();
     this.sourceDevice = signal.getSourceDevice();
     this.message      = signal.getMessage().toByteArray();
@@ -132,10 +132,10 @@ public int getType() {
   }
 
   public boolean isSecureMessage() {
-    return getType() == PushMessage.TYPE_MESSAGE_CIPHERTEXT;
+    return getType() == IncomingPushMessageSignal.Type.CIPHERTEXT_VALUE;
   }
 
   public boolean isPreKeyBundle() {
-    return getType() == PushMessage.TYPE_MESSAGE_PREKEY_BUNDLE;
+    return getType() == IncomingPushMessageSignal.Type.PREKEY_BUNDLE_VALUE;
   }
 }
diff --git a/library/src/org/whispersystems/textsecure/push/PushMessage.java b/library/src/org/whispersystems/textsecure/push/PushMessage.java
diff --git a/library/src/org/whispersystems/textsecure/push/PushMessageProtos.java b/library/src/org/whispersystems/textsecure/push/PushMessageProtos.java
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipients.java b/src/org/thoughtcrime/securesms/recipients/Recipients.java
@@ -18,7 +18,6 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Log;
 import android.util.Patterns;
 
 import org.thoughtcrime.securesms.recipients.Recipient.RecipientModifiedListener;