android/build.gradle

@@ -13,16 +13,16 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 archivesBaseName = "signal-service-android"
-version          = version_number
-group            = group_info
+version          = "2.4.7"
+group            = "org.whispersystems"
 
 repositories {
     mavenCentral()
     mavenLocal()
 }
 
 dependencies {
-    compile "org.whispersystems:signal-protocol-android:${signal_version}"
+    compile "org.whispersystems:signal-protocol-android:2.4.0"
     compile (project(':java')) {
         exclude group: 'org.whispersystems', module: 'signal-protocol-java'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
@@ -61,49 +61,6 @@ signing {
     sign configurations.archives
 }
 
-
-def sonatypeRepo            = sonatypeRepo != null ? sonatypeRepo : ""
-def whisperSonatypeUsername = whisperSonatypeUsername != null ? whisperSonatypeUsername : ""
-def whisperSonatypePassword = whisperSonatypePassword != null ? whisperSonatypePassword : ""
-
-uploadArchives {
-    configuration = configurations.archives
-    repositories.mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        repository(url: sonatypeRepo) {
-            authentication(userName: whisperSonatypeUsername, password: whisperSonatypePassword)
-        }
-
-        pom.project {
-            name 'signal-service-android'
-            packaging 'aar'
-            description 'Signal Service communication library for Android'
-            url 'https://github.com/WhisperSystems/libsignal-service-java'
-
-            scm {
-                url 'scm:git@github.com:WhisperSystems/libsignal-service-java.git'
-                connection 'scm:git@github.com:WhisperSystems/libsignal-service-java.git'
-                developerConnection 'scm:git@github.com:WhisperSystems/libsignal-service-java.git'
-            }
-
-            licenses {
-                license {
-                    name 'GPLv3'
-                    url 'https://www.gnu.org/licenses/gpl-3.0.txt'
-                    distribution 'repo'
-                }
-            }
-
-            developers {
-                developer {
-                    name 'Moxie Marlinspike'
-                }
-            }
-        }
-    }
-}
-
 task installArchives(type: Upload) {
     description "Installs the artifacts to the local Maven repository."
     configuration = configurations['archives']

java/build.gradle

@@ -4,8 +4,8 @@ apply plugin: 'signing'
 
 sourceCompatibility = 1.7
 archivesBaseName    = "signal-service-java"
-version             = version_number
-group               = group_info
+version             = "2.4.7"
+group               = "org.whispersystems"
 
 repositories {
     mavenCentral()
@@ -17,7 +17,7 @@ dependencies {
     compile 'com.googlecode.libphonenumber:libphonenumber:8.0.0'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.5.0'
 
-    compile "org.whispersystems:signal-protocol-java:${signal_version}"
+    compile "org.whispersystems:signal-protocol-java:2.4.0"
     compile 'com.squareup.okhttp3:okhttp:3.5.0'
     compile 'org.apache.httpcomponents:httpclient:4.4'
 
@@ -36,49 +36,6 @@ signing {
     sign configurations.archives
 }
 
-
-def sonatypeRepo            = sonatypeRepo != null ? sonatypeRepo : ""
-def whisperSonatypeUsername = whisperSonatypeUsername != null ? whisperSonatypeUsername : ""
-def whisperSonatypePassword = whisperSonatypePassword != null ? whisperSonatypePassword : ""
-
-uploadArchives {
-    configuration = configurations.archives
-    repositories.mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        repository(url: sonatypeRepo) {
-            authentication(userName: whisperSonatypeUsername, password: whisperSonatypePassword)
-        }
-
-        pom.project {
-            name 'signal-service-java'
-            packaging 'jar'
-            description 'Signal Service communication library for Java'
-            url 'https://github.com/WhisperSystems/libsignal-service-java'
-
-            scm {
-                url 'scm:git@github.com:WhisperSystems/libsignal-service-java.git'
-                connection 'scm:git@github.com:WhisperSystems/libsignal-service-java.git'
-                developerConnection 'scm:git@github.com:WhisperSystems/libsignal-service-java.git'
-            }
-
-            licenses {
-                license {
-                    name 'GPLv3'
-                    url 'https://www.gnu.org/licenses/gpl-3.0.txt'
-                    distribution 'repo'
-                }
-            }
-
-            developers {
-                developer {
-                    name 'Moxie Marlinspike'
-                }
-            }
-        }
-    }
-}
-
 task installArchives(type: Upload) {
     description "Installs the artifacts to the local Maven repository."
     configuration = configurations['archives']

java/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java

@@ -109,6 +109,8 @@ public void requestVoiceVerificationCode() throws IOException {
    *                         {@link #requestVoiceVerificationCode}).
    * @param signalingKey 52 random bytes.  A 32 byte AES key and a 20 byte Hmac256 key,
    *                     concatenated.
+   * @param fetchesMessages A boolean that indicates whether the client supports fetching messages
+   *                     (websockets)
    * @param signalProtocolRegistrationId A random 14-bit number that identifies this Signal install.
    *                                     This value should remain consistent across registrations for the
    *                                     same install, but probabilistically differ across registrations
@@ -117,10 +119,11 @@ public void requestVoiceVerificationCode() throws IOException {
    *
    * @throws IOException
    */
-  public void verifyAccountWithCode(String verificationCode, String signalingKey, int signalProtocolRegistrationId, boolean voice)
+  public void verifyAccountWithCode(String verificationCode, String signalingKey, boolean fetchesMessages,
+                            int signalProtocolRegistrationId, boolean voice)
       throws IOException
   {
-    this.pushServiceSocket.verifyAccountCode(verificationCode, signalingKey,
+    this.pushServiceSocket.verifyAccountCode(verificationCode, signalingKey, fetchesMessages,
                                              signalProtocolRegistrationId, voice);
   }
 
@@ -131,6 +134,8 @@ public void verifyAccountWithCode(String verificationCode, String signalingKey,
 
    * @param signalingKey 52 random bytes.  A 32 byte AES key and a 20 byte Hmac256 key,
    *                     concatenated.
+   * @param fetchesMessages A boolean that indicates whether the client supports fetching messages
+   *                     (websockets)
    * @param signalProtocolRegistrationId A random 14-bit number that identifies this Signal install.
    *                                     This value should remain consistent across registrations for the
    *                                     same install, but probabilistically differ across registrations
@@ -139,16 +144,18 @@ public void verifyAccountWithCode(String verificationCode, String signalingKey,
    *
    * @throws IOException
    */
-  public void verifyAccountWithToken(String verificationToken, String signalingKey, int signalProtocolRegistrationId, boolean voice)
+  public void verifyAccountWithToken(String verificationToken, String signalingKey, boolean fetchesMessages, int signalProtocolRegistrationId, boolean voice)
       throws IOException
   {
-    this.pushServiceSocket.verifyAccountToken(verificationToken, signalingKey, signalProtocolRegistrationId, voice);
+    this.pushServiceSocket.verifyAccountToken(verificationToken, signalingKey, fetchesMessages, signalProtocolRegistrationId, voice);
   }
 
   /**
    * Refresh account attributes with server.
    *
    * @param signalingKey 52 random bytes.  A 32 byte AES key and a 20 byte Hmac256 key, concatenated.
+   * @param fetchesMessages A boolean that indicates whether the client supports fetching messages
+   *                     (websockets)
    * @param signalProtocolRegistrationId A random 14-bit number that identifies this Signal install.
    *                                     This value should remain consistent across registrations for the same
    *                                     install, but probabilistically differ across registrations for
@@ -157,10 +164,11 @@ public void verifyAccountWithToken(String verificationToken, String signalingKey
    *
    * @throws IOException
    */
-  public void setAccountAttributes(String signalingKey, int signalProtocolRegistrationId, boolean voice)
+  public void setAccountAttributes(String signalingKey, boolean fetchesMessages,
+                                   int signalProtocolRegistrationId, boolean voice)
       throws IOException
   {
-    this.pushServiceSocket.setAccountAttributes(signalingKey, signalProtocolRegistrationId, voice);
+    this.pushServiceSocket.setAccountAttributes(signalingKey, fetchesMessages, signalProtocolRegistrationId, voice);
   }
 
   /**

java/src/main/java/org/whispersystems/signalservice/internal/push/AccountAttributes.java

@@ -14,14 +14,18 @@ public class AccountAttributes {
   private String  signalingKey;
 
   @JsonProperty
-  private int     registrationId;
+  private boolean fetchesMessages;
 
   @JsonProperty
   private boolean voice;
 
-  public AccountAttributes(String signalingKey, int registrationId, boolean voice) {
-    this.signalingKey   = signalingKey;
-    this.registrationId = registrationId;
+  @JsonProperty
+  private int     registrationId;
+
+  public AccountAttributes(String signalingKey, boolean fetchesMessages, int registrationId, boolean voice) {
+    this.signalingKey    = signalingKey;
+    this.fetchesMessages = fetchesMessages;
+    this.registrationId  = registrationId;
     this.voice          = voice;
   }
 
@@ -35,6 +39,8 @@ public int getRegistrationId() {
     return registrationId;
   }
 
+  public boolean isFetchesMessages() { return fetchesMessages; }
+
   public boolean isVoice() {
     return voice;
   }

java/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java

@@ -123,24 +123,29 @@ public void createAccount(boolean voice) throws IOException {
     makeRequest(String.format(path, credentialsProvider.getUser()), "GET", null);
   }
 
-  public void verifyAccountCode(String verificationCode, String signalingKey, int registrationId, boolean voice)
+  public void verifyAccountCode(String verificationCode, String signalingKey,
+                                boolean fetchesMessages, int registrationId, boolean voice)
       throws IOException
   {
-    AccountAttributes signalingKeyEntity = new AccountAttributes(signalingKey, registrationId, voice);
+    AccountAttributes signalingKeyEntity = new AccountAttributes(signalingKey,
+            fetchesMessages, registrationId, voice);
     makeRequest(String.format(VERIFY_ACCOUNT_CODE_PATH, verificationCode),
                 "PUT", JsonUtil.toJson(signalingKeyEntity));
   }
 
-  public void verifyAccountToken(String verificationToken, String signalingKey, int registrationId, boolean voice)
+  public void verifyAccountToken(String verificationToken, String signalingKey, boolean fetchesMessages,
+                                 int registrationId, boolean voice)
       throws IOException
   {
-    AccountAttributes signalingKeyEntity = new AccountAttributes(signalingKey, registrationId, voice);
+    AccountAttributes signalingKeyEntity = new AccountAttributes(signalingKey, fetchesMessages, registrationId, voice);
     makeRequest(String.format(VERIFY_ACCOUNT_TOKEN_PATH, verificationToken),
                 "PUT", JsonUtil.toJson(signalingKeyEntity));
   }
 
-  public void setAccountAttributes(String signalingKey, int registrationId, boolean voice) throws IOException {
-    AccountAttributes accountAttributes = new AccountAttributes(signalingKey, registrationId, voice);
+  public void setAccountAttributes(String signalingKey, boolean fetchesMessages,
+                                   int registrationId, boolean voice)
+          throws IOException {
+    AccountAttributes accountAttributes = new AccountAttributes(signalingKey, fetchesMessages, registrationId, voice);
     makeRequest(SET_ACCOUNT_ATTRIBUTES, "PUT", JsonUtil.toJson(accountAttributes));
   }