Bump version to 2.3.3

// FREEBIE

.gitattributes

@@ -0,0 +1 @@
+*.ai binary

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs
+lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,sr:sr
 
 
 [textsecure-official.master]

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms"
-      android:versionCode="83"
-      android:versionName="2.2.0">
+      android:versionCode="87"
+      android:versionName="2.3.3">
 
     <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
@@ -114,12 +114,12 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DatabaseMigrationActivity"
-              android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"
+              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DatabaseUpgradeActivity"
-              android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"
+              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -192,6 +192,11 @@
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".MediaPreviewActivity"
+              android:label="@string/AndroidManifest__media_preview"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".DummyActivity"
               android:theme="@android:style/Theme.NoDisplay"
               android:enabled="true"
@@ -203,13 +208,14 @@
               android:clearTaskOnLaunch="true"
               android:finishOnTaskLaunch="true" />
 
-    <service android:enabled="true" android:name=".service.GcmRegistrationService"/>
+    <activity android:name=".PlayServicesProblemActivity"
+              android:theme="@android:style/Theme.Translucent.NoTitleBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
     <service android:enabled="true" android:name=".service.KeyCachingService"/>
-    <service android:enabled="true" android:name=".service.SendReceiveService"/>
     <service android:enabled="true" android:name=".service.RegistrationService"/>
     <service android:enabled="true" android:name=".service.DirectoryRefreshService"/>
-    <service android:enabled="true" android:name=".service.PreKeyService"/>
 
     <service android:name=".service.QuickResponseService"
              android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"

BUILDING.md

@@ -17,7 +17,11 @@ The following steps should help you (re)build TextSecure from the command line.
         git clone https://github.com/WhisperSystems/TextSecure.git
 
 2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed somewhere on your system.
-3. Ensure the "Android Support Repository" and "Android SDK Build-tools" are installed from the Android SDK manager.
+3. Ensure that the following packages are installed from the Android SDK manager:
+    * Android SDK Build Tools
+    * SDK Platform
+    * Android Support Repository
+    * Google Repository
 4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.
 
         sdk.dir=\<path to your sdk installation\>
@@ -29,13 +33,13 @@ The following steps should help you (re)build TextSecure from the command line.
 Re-building native components
 -----------------------------
 
-Note: This step is optional; native components are contained as binaries (see [library/libs](library/libs)).
+Note: This step is optional; native components are contained as binaries (see [libaxolotl/libs](libaxolotl/libs)).
 
 1. Ensure that the Android NDK is installed.
 
 Execute ndk-build:
 
-    cd library
+    cd libaxolotl
     ndk-build
 
 Afterwards, execute Gradle as above to re-create the APK.

androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java

@@ -0,0 +1,153 @@
+package org.thoughtcrime.securesms.jobs;
+
+import android.test.AndroidTestCase;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule;
+import org.whispersystems.libaxolotl.ecc.Curve;
+import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
+import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
+import org.whispersystems.textsecure.api.TextSecureAccountManager;
+import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import dagger.Module;
+import dagger.ObjectGraph;
+import dagger.Provides;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+public class CleanPreKeysJobTest extends AndroidTestCase {
+
+  public void testSignedPreKeyRotationNotRegistered() throws IOException, MasterSecretJob.RequirementNotMetException {
+    TextSecureAccountManager accountManager    = mock(TextSecureAccountManager.class);
+    SignedPreKeyStore        signedPreKeyStore = mock(SignedPreKeyStore.class);
+    MasterSecret             masterSecret      = mock(MasterSecret.class);
+    when(accountManager.getSignedPreKey()).thenReturn(null);
+
+    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(getContext());
+
+    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
+    objectGraph.inject(cleanPreKeysJob);
+
+    cleanPreKeysJob.onRun(masterSecret);
+
+    verify(accountManager).getSignedPreKey();
+    verifyNoMoreInteractions(signedPreKeyStore);
+  }
+
+  public void testSignedPreKeyEviction() throws Exception {
+    SignedPreKeyStore        signedPreKeyStore         = mock(SignedPreKeyStore.class);
+    TextSecureAccountManager accountManager            = mock(TextSecureAccountManager.class);
+    SignedPreKeyEntity       currentSignedPreKeyEntity = mock(SignedPreKeyEntity.class);
+    MasterSecret             masterSecret              = mock(MasterSecret.class);
+
+    when(currentSignedPreKeyEntity.getKeyId()).thenReturn(3133);
+    when(accountManager.getSignedPreKey()).thenReturn(currentSignedPreKeyEntity);
+
+    final SignedPreKeyRecord currentRecord = new SignedPreKeyRecord(3133, System.currentTimeMillis(), Curve.generateKeyPair(), new byte[64]);
+
+    List<SignedPreKeyRecord> records = new LinkedList<SignedPreKeyRecord>() {{
+      add(new SignedPreKeyRecord(2, 11, Curve.generateKeyPair(), new byte[32]));
+      add(new SignedPreKeyRecord(4, System.currentTimeMillis() - 100, Curve.generateKeyPair(), new byte[64]));
+      add(currentRecord);
+      add(new SignedPreKeyRecord(3, System.currentTimeMillis() - 90, Curve.generateKeyPair(), new byte[64]));
+      add(new SignedPreKeyRecord(1, 10, Curve.generateKeyPair(), new byte[32]));
+    }};
+
+    when(signedPreKeyStore.loadSignedPreKeys()).thenReturn(records);
+    when(signedPreKeyStore.loadSignedPreKey(eq(3133))).thenReturn(currentRecord);
+
+    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(getContext());
+
+    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
+    objectGraph.inject(cleanPreKeysJob);
+
+    cleanPreKeysJob.onRun(masterSecret);
+
+    verify(signedPreKeyStore).removeSignedPreKey(eq(1));
+    verify(signedPreKeyStore, times(1)).removeSignedPreKey(anyInt());
+  }
+
+  public void testSignedPreKeyNoEviction() throws Exception {
+    SignedPreKeyStore        signedPreKeyStore         = mock(SignedPreKeyStore.class);
+    TextSecureAccountManager accountManager            = mock(TextSecureAccountManager.class);
+    SignedPreKeyEntity       currentSignedPreKeyEntity = mock(SignedPreKeyEntity.class);
+
+    when(currentSignedPreKeyEntity.getKeyId()).thenReturn(3133);
+    when(accountManager.getSignedPreKey()).thenReturn(currentSignedPreKeyEntity);
+
+    final SignedPreKeyRecord currentRecord = new SignedPreKeyRecord(3133, System.currentTimeMillis(), Curve.generateKeyPair(), new byte[64]);
+
+    List<SignedPreKeyRecord> records = new LinkedList<SignedPreKeyRecord>() {{
+      add(currentRecord);
+    }};
+
+    when(signedPreKeyStore.loadSignedPreKeys()).thenReturn(records);
+    when(signedPreKeyStore.loadSignedPreKey(eq(3133))).thenReturn(currentRecord);
+
+    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(getContext());
+
+    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
+    objectGraph.inject(cleanPreKeysJob);
+
+    verify(signedPreKeyStore, never()).removeSignedPreKey(anyInt());
+  }
+
+  public void testConnectionError() throws Exception {
+    SignedPreKeyStore        signedPreKeyStore = mock(SignedPreKeyStore.class);
+    TextSecureAccountManager accountManager    = mock(TextSecureAccountManager.class);
+    MasterSecret             masterSecret      = mock(MasterSecret.class);
+
+    when(accountManager.getSignedPreKey()).thenThrow(new PushNetworkException("Connectivity error!"));
+
+    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(getContext());
+
+    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
+    objectGraph.inject(cleanPreKeysJob);
+
+    try {
+      cleanPreKeysJob.onRun(masterSecret);
+      throw new AssertionError("should have failed!");
+    } catch (IOException e) {
+      assertTrue(cleanPreKeysJob.onShouldRetry(e));
+    }
+  }
+
+  @Module(injects = {CleanPreKeysJob.class})
+  public static class TestModule {
+    private final TextSecureAccountManager accountManager;
+    private final SignedPreKeyStore        signedPreKeyStore;
+
+    private TestModule(TextSecureAccountManager accountManager, SignedPreKeyStore signedPreKeyStore) {
+      this.accountManager    = accountManager;
+      this.signedPreKeyStore = signedPreKeyStore;
+    }
+
+    @Provides TextSecureAccountManager provideTextSecureAccountManager() {
+      return accountManager;
+    }
+
+    @Provides
+    AxolotlStorageModule.SignedPreKeyStoreFactory provideSignedPreKeyStore() {
+      return new AxolotlStorageModule.SignedPreKeyStoreFactory() {
+        @Override
+        public SignedPreKeyStore create(MasterSecret masterSecret) {
+          return signedPreKeyStore;
+        }
+      };
+    }
+  }
+
+}

androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java

@@ -0,0 +1,101 @@
+package org.thoughtcrime.securesms.jobs;
+
+import android.test.AndroidTestCase;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.whispersystems.textsecure.api.TextSecureMessageSender;
+import org.whispersystems.textsecure.api.push.PushAddress;
+import org.whispersystems.textsecure.api.push.exceptions.NotFoundException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
+
+import java.io.IOException;
+
+import dagger.Module;
+import dagger.ObjectGraph;
+import dagger.Provides;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.thoughtcrime.securesms.dependencies.TextSecureCommunicationModule.TextSecureMessageSenderFactory;
+
+public class DeliveryReceiptJobTest extends AndroidTestCase {
+
+  public void testDelivery() throws IOException {
+    TextSecureMessageSender textSecureMessageSender = mock(TextSecureMessageSender.class);
+    long                    timestamp               = System.currentTimeMillis();
+
+    DeliveryReceiptJob deliveryReceiptJob = new DeliveryReceiptJob(getContext(),
+                                                                   "+14152222222",
+                                                                   timestamp, "foo");
+
+    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(textSecureMessageSender));
+    objectGraph.inject(deliveryReceiptJob);
+
+    deliveryReceiptJob.onRun();
+
+    ArgumentCaptor<PushAddress> captor = ArgumentCaptor.forClass(PushAddress.class);
+    verify(textSecureMessageSender).sendDeliveryReceipt(captor.capture(), eq(timestamp));
+
+    assertTrue(captor.getValue().getRelay().equals("foo"));
+    assertTrue(captor.getValue().getNumber().equals("+14152222222"));
+  }
+
+  public void testNetworkError() throws IOException {
+    TextSecureMessageSender textSecureMessageSender = mock(TextSecureMessageSender.class);
+    long                    timestamp               = System.currentTimeMillis();
+
+    Mockito.doThrow(new PushNetworkException("network error"))
+           .when(textSecureMessageSender)
+           .sendDeliveryReceipt(any(PushAddress.class), eq(timestamp));
+
+
+    DeliveryReceiptJob deliveryReceiptJob = new DeliveryReceiptJob(getContext(),
+                                                                   "+14152222222",
+                                                                   timestamp, "foo");
+
+    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(textSecureMessageSender));
+    objectGraph.inject(deliveryReceiptJob);
+
+    try {
+      deliveryReceiptJob.onRun();
+      throw new AssertionError();
+    } catch (IOException e) {
+      assertTrue(deliveryReceiptJob.onShouldRetry(e));
+    }
+
+    Mockito.doThrow(new NotFoundException("not found"))
+           .when(textSecureMessageSender)
+           .sendDeliveryReceipt(any(PushAddress.class), eq(timestamp));
+
+    try {
+      deliveryReceiptJob.onRun();
+      throw new AssertionError();
+    } catch (IOException e) {
+      assertFalse(deliveryReceiptJob.onShouldRetry(e));
+    }
+  }
+
+  @Module(injects = DeliveryReceiptJob.class)
+  public static class TestModule {
+
+    private final TextSecureMessageSender textSecureMessageSender;
+
+    public TestModule(TextSecureMessageSender textSecureMessageSender) {
+      this.textSecureMessageSender = textSecureMessageSender;
+    }
+
+    @Provides TextSecureMessageSenderFactory provideTextSecureMessageSenderFactory() {
+      return new TextSecureMessageSenderFactory() {
+        @Override
+        public TextSecureMessageSender create(MasterSecret masterSecret) {
+          return textSecureMessageSender;
+        }
+      };
+    }
+  }
+
+}

androidTest/java/org/thoughtcrime/securesms/service/PreKeyServiceTest.java

@@ -1,92 +0,0 @@
-package org.thoughtcrime.securesms.service;
-
-import android.test.AndroidTestCase;
-
-import org.whispersystems.libaxolotl.ecc.Curve;
-import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
-import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
-import org.whispersystems.textsecure.push.PushServiceSocket;
-import org.whispersystems.textsecure.push.SignedPreKeyEntity;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-public class PreKeyServiceTest extends AndroidTestCase {
-
-  public void testSignedPreKeyRotationNotRegistered() throws IOException {
-    SignedPreKeyStore signedPreKeyStore = mock(SignedPreKeyStore.class);
-    PushServiceSocket pushServiceSocket = mock(PushServiceSocket.class);
-
-    when(pushServiceSocket.getCurrentSignedPreKey()).thenReturn(null);
-
-    PreKeyService.CleanSignedPreKeysTask cleanTask = new PreKeyService.CleanSignedPreKeysTask(signedPreKeyStore,
-                                                                                              pushServiceSocket);
-
-    cleanTask.run();
-
-    verify(pushServiceSocket).getCurrentSignedPreKey();
-    verifyNoMoreInteractions(signedPreKeyStore);
-  }
-
-  public void testSignedPreKeyEviction() throws Exception {
-    SignedPreKeyStore  signedPreKeyStore         = mock(SignedPreKeyStore.class);
-    PushServiceSocket  pushServiceSocket         = mock(PushServiceSocket.class);
-    SignedPreKeyEntity currentSignedPreKeyEntity = mock(SignedPreKeyEntity.class);
-
-    when(currentSignedPreKeyEntity.getKeyId()).thenReturn(3133);
-    when(pushServiceSocket.getCurrentSignedPreKey()).thenReturn(currentSignedPreKeyEntity);
-
-    final SignedPreKeyRecord currentRecord = new SignedPreKeyRecord(3133, System.currentTimeMillis(), Curve.generateKeyPair(true), new byte[64]);
-
-    List<SignedPreKeyRecord> records = new LinkedList<SignedPreKeyRecord>() {{
-      add(new SignedPreKeyRecord(1, 10, Curve.generateKeyPair(true), new byte[32]));
-      add(new SignedPreKeyRecord(2, 11, Curve.generateKeyPair(true), new byte[32]));
-      add(new SignedPreKeyRecord(3, System.currentTimeMillis() - 90, Curve.generateKeyPair(true), new byte[64]));
-      add(new SignedPreKeyRecord(4, System.currentTimeMillis() - 100, Curve.generateKeyPair(true), new byte[64]));
-      add(currentRecord);
-    }};
-
-    when(signedPreKeyStore.loadSignedPreKeys()).thenReturn(records);
-    when(signedPreKeyStore.loadSignedPreKey(eq(3133))).thenReturn(currentRecord);
-
-    PreKeyService.CleanSignedPreKeysTask cleanTask = new PreKeyService.CleanSignedPreKeysTask(signedPreKeyStore, pushServiceSocket);
-    cleanTask.run();
-
-    verify(signedPreKeyStore).removeSignedPreKey(eq(1));
-    verify(signedPreKeyStore).removeSignedPreKey(eq(2));
-    verify(signedPreKeyStore, times(2)).removeSignedPreKey(anyInt());
-  }
-
-  public void testSignedPreKeyNoEviction() throws Exception {
-    SignedPreKeyStore  signedPreKeyStore         = mock(SignedPreKeyStore.class);
-    PushServiceSocket  pushServiceSocket         = mock(PushServiceSocket.class);
-    SignedPreKeyEntity currentSignedPreKeyEntity = mock(SignedPreKeyEntity.class);
-
-    when(currentSignedPreKeyEntity.getKeyId()).thenReturn(3133);
-    when(pushServiceSocket.getCurrentSignedPreKey()).thenReturn(currentSignedPreKeyEntity);
-
-    final SignedPreKeyRecord currentRecord = new SignedPreKeyRecord(3133, System.currentTimeMillis(), Curve.generateKeyPair(true), new byte[64]);
-
-    List<SignedPreKeyRecord> records = new LinkedList<SignedPreKeyRecord>() {{
-      add(currentRecord);
-    }};
-
-    when(signedPreKeyStore.loadSignedPreKeys()).thenReturn(records);
-    when(signedPreKeyStore.loadSignedPreKey(eq(3133))).thenReturn(currentRecord);
-
-    PreKeyService.CleanSignedPreKeysTask cleanTask = new PreKeyService.CleanSignedPreKeysTask(signedPreKeyStore, pushServiceSocket);
-    cleanTask.run();
-
-    verify(signedPreKeyStore, never()).removeSignedPreKey(anyInt());
-  }
-}

androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java

@@ -4,8 +4,8 @@ import android.test.AndroidTestCase;
 
 import junit.framework.AssertionFailedError;
 
-import org.whispersystems.textsecure.util.InvalidNumberException;
-import org.whispersystems.textsecure.util.PhoneNumberFormatter;
+import org.whispersystems.textsecure.api.util.InvalidNumberException;
+import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
 import static org.fest.assertions.api.Assertions.assertThat;
 
 public class PhoneNumberFormatterTest extends AndroidTestCase {

build.gradle

@@ -5,12 +5,13 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.2'
+        classpath 'com.android.tools.build:gradle:0.14.2'
         classpath files('libs/gradle-witness.jar')
     }
 }
 
 apply plugin: 'com.android.application'
+apply from: 'strip_play_services.gradle'
 apply plugin: 'witness'
 
 repositories {
@@ -18,7 +19,7 @@ repositories {
         url "https://repo1.maven.org/maven2"
     }
     maven {
-        url "https://raw.github.com/whispersystems/maven/master/gcm-client/releases/"
+        url "https://raw.github.com/whispersystems/maven/master/preferencefragment/releases/"
     }
     maven {
         url "https://raw.github.com/whispersystems/maven/master/gson/releases/"
@@ -29,42 +30,59 @@ repositories {
 }
 
 dependencies {
-    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-    compile 'com.android.support:support-v4:20.0.0'
     compile 'se.emilsjolander:stickylistheaders:2.2.0'
-    compile 'com.google.android.gms:play-services:5.0.89'
+    compile 'com.google.android.gms:play-services:6.1.71'
     compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
     compile 'org.w3c:smil:1.0.0'
     compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
+    compile 'com.github.chrisbanes.photoview:library:1.2.3'
+    compile 'com.android.support:appcompat-v7:20.0.0'
+    compile 'com.madgag.spongycastle:prov:1.51.0.0'
+    compile 'com.google.zxing:android-integration:3.1.0'
+    compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){
+        exclude module: 'support-v4'
+    }
+    compile 'com.squareup.dagger:dagger:1.2.2'
+    provided 'com.squareup.dagger:dagger-compiler:1.2.2'
+
+    compile 'org.whispersystems:jobmanager:0.9.0'
+    compile 'org.whispersystems:libpastelog:1.0.2'
 
     androidTestCompile 'com.squareup:fest-android:1.0.8'
     androidTestCompile 'com.google.dexmaker:dexmaker:1.1'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.1'
 
-    compile project(':library')
-    compile project(':jobqueue')
+    compile project(':libtextsecure')
 }
 
 dependencyVerification {
     verify = [
-            'com.actionbarsherlock:actionbarsherlock:5ab04d74101f70024b222e3ff9c87bee151ec43331b4a2134b6cc08cf8565819',
-            'com.android.support:support-v4:81f2b1c2c94efd5a4ec7fcd97b6cdcd00e87a933905c5c86103c7319eb024572',
             'se.emilsjolander:stickylistheaders:89146b46c96fea0e40200474a2625cda10fe94891e4128f53cdb42375091b9b6',
-            'com.google.android.gms:play-services:38f326e525830f1d70f60f594ceafcbdf5b312287ddbecd338fd1ed7958a4b1e',
+            'com.google.android.gms:play-services:32e7d1834a1cf8fa4b17e8d359db580c286e26c1eefbf84fdb9996eac8d74919',
             'com.astuetz:pagerslidingtabstrip:f1641396732c7132a7abb837e482e5ee2b0ebb8d10813fc52bbaec2c15c184c2',
             'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b',
             'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
-            'com.android.support:support-annotations:1aa96ef0cc4a445bfc2f93ccf762305bc57fa107b12afe9d11f3863ae8a11036',
+            'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc',
+            'com.android.support:appcompat-v7:736f576ab0b68d27bdf18b1e7931566e6d8254b73965175313e87f8866b91547',
+            'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
+            'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
+            'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad',
+            'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883',
+            'com.android.support:support-v4:81f2b1c2c94efd5a4ec7fcd97b6cdcd00e87a933905c5c86103c7319eb024572',
+            'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
+            'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
+            'org.whispersystems:libpastelog:9798b3c93a91082c2c68542ce5b5c182e18556aebdcb7c8cebbd89eb48ac4047',
             'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
-            'com.madgag:sc-light-jdk15on:931f39d351429fb96c2f749e7ecb1a256a8ebbf5edca7995c9cc085b94d1841d',
             'com.googlecode.libphonenumber:libphonenumber:eba17eae81dd622ea89a00a3a8c025b2f25d342e0d9644c5b62e16f15687c3ab',
             'org.whispersystems:gson:08f4f7498455d1539c9233e5aac18e9b1805815ef29221572996508eb512fe51',
+            'org.whispersystems:jobmanager:adb4329b69035053a7b6a48e22a3280235ac405b225ed8679b994612a8e6f5b6',
+            'com.android.support:support-annotations:1aa96ef0cc4a445bfc2f93ccf762305bc57fa107b12afe9d11f3863ae8a11036',
     ]
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 21
+    buildToolsVersion '21.1.1'
 
     defaultConfig {
         minSdkVersion 9
@@ -77,6 +95,15 @@ android {
     }
 
     android {
+        buildTypes {
+            debug {
+                minifyEnabled false
+            }
+            release {
+                minifyEnabled false
+            }
+        }
+
         sourceSets {
             main {
                 manifest.srcFile 'AndroidManifest.xml'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jun 09 23:26:49 PDT 2014
+#Fri Nov 28 10:03:17 PST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

jobqueue/.gitignore

@@ -1 +0,0 @@
-/build

jobqueue/build.gradle

@@ -1,19 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 20
-    buildToolsVersion "20.0.0"
-
-    defaultConfig {
-        applicationId "org.whispersystems.jobqueue"
-        minSdkVersion 9
-        targetSdkVersion 19
-        versionCode 1
-        versionName "1.0"
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/JobManagerTest.java

@@ -1,193 +0,0 @@
-package org.whispersystems.jobqueue;
-
-import android.test.AndroidTestCase;
-
-import org.whispersystems.jobqueue.jobs.PersistentTestJob;
-import org.whispersystems.jobqueue.jobs.RequirementDeferringTestJob;
-import org.whispersystems.jobqueue.jobs.RequirementTestJob;
-import org.whispersystems.jobqueue.jobs.TestJob;
-import org.whispersystems.jobqueue.persistence.JavaJobSerializer;
-import org.whispersystems.jobqueue.util.MockRequirement;
-import org.whispersystems.jobqueue.util.MockRequirementProvider;
-import org.whispersystems.jobqueue.util.PersistentMockRequirement;
-import org.whispersystems.jobqueue.util.PersistentRequirement;
-import org.whispersystems.jobqueue.util.PersistentResult;
-import org.whispersystems.jobqueue.util.RunnableThrowable;
-
-import java.io.IOException;
-
-public class JobManagerTest extends AndroidTestCase {
-
-  public void testTransientJobExecution() throws InterruptedException {
-    TestJob    testJob    = new TestJob();
-    JobManager jobManager = new JobManager(getContext(), "transient-test", null, null, 1);
-
-    jobManager.add(testJob);
-
-    assertTrue(testJob.isAdded());
-    assertTrue(testJob.isRan());
-  }
-
-  public void testTransientRequirementJobExecution() throws InterruptedException {
-    MockRequirementProvider provider    = new MockRequirementProvider();
-    MockRequirement         requirement = new MockRequirement(false);
-    TestJob                 testJob     = new RequirementTestJob(requirement);
-    JobManager              jobManager  = new JobManager(getContext(), "transient-requirement-test",
-                                                         provider, null, 1);
-
-    jobManager.add(testJob);
-
-    assertTrue(testJob.isAdded());
-    assertTrue(!testJob.isRan());
-
-    requirement.setPresent(true);
-    provider.fireChange();
-
-    assertTrue(testJob.isRan());
-  }
-
-  public void testTransientRequirementDeferringJobExecution() throws InterruptedException {
-    final Object lock = new Object();
-
-    RunnableThrowable waitRunnable = new RunnableThrowable() {
-      public Boolean shouldThrow = false;
-
-      @Override
-      public void run() throws Exception {
-        try {
-          synchronized (lock) {
-            lock.wait();
-
-            if (shouldThrow) {
-              throw new Exception();
-            }
-          }
-        } catch (InterruptedException e) {
-          throw new AssertionError(e);
-        }
-      }
-      @Override
-      public void shouldThrow(Boolean value) {
-        shouldThrow = value;
-      }
-    };
-
-    MockRequirementProvider     provider    = new MockRequirementProvider();
-    MockRequirement             requirement = new MockRequirement(false);
-    RequirementDeferringTestJob testJob     = new RequirementDeferringTestJob(requirement, 5, waitRunnable);
-    JobManager                  jobManager  = new JobManager(getContext(), "transient-requirement-test",
-                                                             provider, null, 1);
-
-    jobManager.add(testJob);
-
-    waitRunnable.shouldThrow(true);
-    requirement.setPresent(true);
-    provider.fireChange();
-
-    assertTrue(testJob.isRan());
-    assertTrue(!testJob.isFinished());
-    synchronized (lock) { lock.notifyAll(); }
-    assertTrue(!testJob.isFinished());
-
-    requirement.setPresent(false);
-    provider.fireChange();
-    assertTrue(!testJob.isFinished());
-    synchronized (lock) { lock.notifyAll(); }
-    assertTrue(!testJob.isFinished());
-
-    waitRunnable.shouldThrow(false);
-    requirement.setPresent(true);
-    provider.fireChange();
-    assertTrue(!testJob.isFinished());
-    synchronized (lock) { lock.notifyAll(); }
-    assertTrue(testJob.isFinished());
-  }
-
-  public void testPersistentJobExecuton() throws InterruptedException {
-    PersistentMockRequirement requirement = new PersistentMockRequirement();
-    PersistentTestJob         testJob     = new PersistentTestJob(requirement);
-    JobManager                jobManager  = new JobManager(getContext(), "persistent-requirement-test3",
-                                                           null, new JavaJobSerializer(getContext()), 1);
-
-    PersistentResult.getInstance().reset();
-    PersistentRequirement.getInstance().setPresent(false);
-
-    jobManager.add(testJob);
-
-    assertTrue(PersistentResult.getInstance().isAdded());
-    assertTrue(!PersistentResult.getInstance().isRan());
-
-    PersistentRequirement.getInstance().setPresent(true);
-    jobManager = new JobManager(getContext(), "persistent-requirement-test3", null,
-                                new JavaJobSerializer(getContext()), 1);
-
-    assertTrue(PersistentResult.getInstance().isRan());
-  }
-
-  public void testEncryptedJobExecuton() throws InterruptedException {
-    EncryptionKeys            keys        = new EncryptionKeys(new byte[30]);
-    PersistentMockRequirement requirement = new PersistentMockRequirement();
-    PersistentTestJob         testJob     = new PersistentTestJob(requirement, keys);
-    JobManager                jobManager  = new JobManager(getContext(), "persistent-requirement-test4",
-                                                           null, new JavaJobSerializer(getContext()), 1);
-    jobManager.setEncryptionKeys(keys);
-
-    PersistentResult.getInstance().reset();
-    PersistentRequirement.getInstance().setPresent(false);
-
-    jobManager.add(testJob);
-
-    assertTrue(PersistentResult.getInstance().isAdded());
-    assertTrue(!PersistentResult.getInstance().isRan());
-
-    PersistentRequirement.getInstance().setPresent(true);
-    jobManager = new JobManager(getContext(), "persistent-requirement-test4", null, new JavaJobSerializer(getContext()), 1);
-
-    assertTrue(!PersistentResult.getInstance().isRan());
-
-    jobManager.setEncryptionKeys(keys);
-
-    assertTrue(PersistentResult.getInstance().isRan());
-  }
-
-  public void testGroupIdExecution() throws InterruptedException {
-    final Object lock = new Object();
-
-    Runnable waitRunnable = new Runnable() {
-      @Override
-      public void run() {
-        try {
-          synchronized (lock) {
-            lock.wait();
-          }
-        } catch (InterruptedException e) {
-          throw new AssertionError(e);
-        }
-      }
-    };
-
-    TestJob    testJobOne   = new TestJob(JobParameters.newBuilder().withGroupId("foo").create(), waitRunnable);
-    TestJob    testJobTwo   = new TestJob(JobParameters.newBuilder().withGroupId("foo").create());
-    TestJob    testJobThree = new TestJob(JobParameters.newBuilder().withGroupId("bar").create());
-    JobManager jobManager   = new JobManager(getContext(), "transient-test", null, null, 3);
-
-    jobManager.add(testJobOne);
-    jobManager.add(testJobTwo);
-    jobManager.add(testJobThree);
-
-    assertTrue(testJobOne.isAdded());
-    assertTrue(testJobTwo.isAdded());
-    assertTrue(testJobThree.isAdded());
-
-    assertTrue(testJobOne.isRan());
-    assertTrue(!testJobTwo.isRan());
-    assertTrue(testJobThree.isRan());
-
-    synchronized (lock) {
-      lock.notifyAll();
-    }
-
-    assertTrue(testJobTwo.isRan());
-  }
-
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/jobs/PersistentTestJob.java

@@ -1,39 +0,0 @@
-package org.whispersystems.jobqueue.jobs;
-
-import org.whispersystems.jobqueue.EncryptionKeys;
-import org.whispersystems.jobqueue.Job;
-import org.whispersystems.jobqueue.JobParameters;
-import org.whispersystems.jobqueue.requirements.Requirement;
-import org.whispersystems.jobqueue.util.PersistentResult;
-
-public class PersistentTestJob extends Job {
-
-  public PersistentTestJob(Requirement requirement) {
-    super(JobParameters.newBuilder().withRequirement(requirement).withPersistence().create());
-  }
-
-  public PersistentTestJob(Requirement requirement, EncryptionKeys keys) {
-    super(JobParameters.newBuilder().withRequirement(requirement).withPersistence().withEncryption(keys).create());
-  }
-
-
-  @Override
-  public void onAdded() {
-    PersistentResult.getInstance().onAdded();;
-  }
-
-  @Override
-  public void onRun() throws Throwable {
-    PersistentResult.getInstance().onRun();
-  }
-
-  @Override
-  public void onCanceled() {
-    PersistentResult.getInstance().onCanceled();
-  }
-
-  @Override
-  public boolean onShouldRetry(Throwable throwable) {
-    return false;
-  }
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/jobs/RequirementDeferringTestJob.java

@@ -1,51 +0,0 @@
-package org.whispersystems.jobqueue.jobs;
-
-  import org.whispersystems.jobqueue.JobParameters;
-  import org.whispersystems.jobqueue.requirements.Requirement;
-  import org.whispersystems.jobqueue.util.RunnableThrowable;
-
-  import java.io.IOException;
-
-public class RequirementDeferringTestJob extends TestJob {
-
-  private final Object FINISHED_LOCK = new Object();
-
-  private boolean finished = false;
-
-  private RunnableThrowable runnable;
-
-  public RequirementDeferringTestJob(Requirement requirement, int retryCount, RunnableThrowable runnable) {
-    super(JobParameters.newBuilder().withRequirement(requirement).withRetryCount(retryCount).create());
-    this.runnable = runnable;
-  }
-
-  @Override
-  public void onRun() throws Throwable {
-    synchronized (RAN_LOCK) {
-      this.ran = true;
-    }
-
-    if (runnable != null)
-      runnable.run();
-
-    synchronized (FINISHED_LOCK) {
-      this.finished = true;
-    }
-  }
-
-  @Override
-  public boolean onShouldRetry(Throwable throwable) {
-    if (throwable instanceof Exception) {
-      return true;
-    }
-    return false;
-  }
-
-  public boolean isFinished() throws InterruptedException {
-    synchronized (FINISHED_LOCK) {
-      if (!finished) FINISHED_LOCK.wait(1000);
-      return finished;
-    }
-  }
-
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/jobs/RequirementTestJob.java

@@ -1,12 +0,0 @@
-package org.whispersystems.jobqueue.jobs;
-
-import org.whispersystems.jobqueue.JobParameters;
-import org.whispersystems.jobqueue.requirements.Requirement;
-
-public class RequirementTestJob extends TestJob {
-
-  public RequirementTestJob(Requirement requirement) {
-    super(JobParameters.newBuilder().withRequirement(requirement).create());
-  }
-
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/jobs/TestJob.java

@@ -1,81 +0,0 @@
-package org.whispersystems.jobqueue.jobs;
-
-import org.whispersystems.jobqueue.Job;
-import org.whispersystems.jobqueue.JobParameters;
-
-public class TestJob extends Job {
-
-  private   final Object ADDED_LOCK    = new Object();
-  protected final Object RAN_LOCK      = new Object();
-  private   final Object CANCELED_LOCK = new Object();
-
-  private   boolean added    = false;
-  protected boolean ran      = false;
-  private   boolean canceled = false;
-
-  private Runnable runnable;
-
-  public TestJob() {
-    this(JobParameters.newBuilder().create());
-  }
-
-  public TestJob(JobParameters parameters) {
-    super(parameters);
-  }
-
-  public TestJob(JobParameters parameters, Runnable runnable) {
-    super(parameters);
-    this.runnable = runnable;
-  }
-
-  @Override
-  public void onAdded() {
-    synchronized (ADDED_LOCK) {
-      this.added = true;
-      this.ADDED_LOCK.notifyAll();
-    }
-  }
-
-  @Override
-  public void onRun() throws Throwable {
-    synchronized (RAN_LOCK) {
-      this.ran = true;
-    }
-
-    if (runnable != null)
-      runnable.run();
-  }
-
-  @Override
-  public void onCanceled() {
-    synchronized (CANCELED_LOCK) {
-      this.canceled = true;
-    }
-  }
-
-  @Override
-  public boolean onShouldRetry(Throwable throwable) {
-    return false;
-  }
-
-  public boolean isAdded() throws InterruptedException {
-    synchronized (ADDED_LOCK) {
-      if (!added) ADDED_LOCK.wait(1000);
-      return added;
-    }
-  }
-
-  public boolean isRan() throws InterruptedException {
-    synchronized (RAN_LOCK) {
-      if (!ran) RAN_LOCK.wait(1000);
-      return ran;
-    }
-  }
-
-  public boolean isCanceled() throws InterruptedException {
-    synchronized (CANCELED_LOCK) {
-      if (!canceled) CANCELED_LOCK.wait(1000);
-      return canceled;
-    }
-  }
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/util/MockRequirement.java

@@ -1,23 +0,0 @@
-package org.whispersystems.jobqueue.util;
-
-import org.whispersystems.jobqueue.requirements.Requirement;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class MockRequirement implements Requirement {
-
-  private AtomicBoolean present;
-
-  public MockRequirement(boolean present) {
-    this.present = new AtomicBoolean(present);
-  }
-
-  public void setPresent(boolean present) {
-    this.present.set(present);
-  }
-
-  @Override
-  public boolean isPresent() {
-    return present.get();
-  }
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/util/MockRequirementProvider.java

@@ -1,18 +0,0 @@
-package org.whispersystems.jobqueue.util;
-
-import org.whispersystems.jobqueue.requirements.RequirementListener;
-import org.whispersystems.jobqueue.requirements.RequirementProvider;
-
-public class MockRequirementProvider implements RequirementProvider {
-
-  private RequirementListener listener;
-
-  public void fireChange() {
-    listener.onRequirementStatusChanged();
-  }
-
-  @Override
-  public void setListener(RequirementListener listener) {
-    this.listener = listener;
-  }
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/util/PersistentMockRequirement.java

@@ -1,10 +0,0 @@
-package org.whispersystems.jobqueue.util;
-
-import org.whispersystems.jobqueue.requirements.Requirement;
-
-public class PersistentMockRequirement implements Requirement {
-  @Override
-  public boolean isPresent() {
-    return PersistentRequirement.getInstance().isPresent();
-  }
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/util/PersistentRequirement.java

@@ -1,22 +0,0 @@
-package org.whispersystems.jobqueue.util;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class PersistentRequirement {
-
-  private AtomicBoolean present = new AtomicBoolean(false);
-
-  private static final PersistentRequirement instance = new PersistentRequirement();
-
-  public static PersistentRequirement getInstance() {
-    return instance;
-  }
-
-  public void setPresent(boolean present) {
-    this.present.set(present);
-  }
-
-  public boolean isPresent() {
-    return present.get();
-  }
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/util/PersistentResult.java

@@ -1,73 +0,0 @@
-package org.whispersystems.jobqueue.util;
-
-public class PersistentResult {
-
-  private final Object ADDED_LOCK    = new Object();
-  private final Object RAN_LOCK      = new Object();
-  private final Object CANCELED_LOCK = new Object();
-
-  private boolean added    = false;
-  private boolean ran      = false;
-  private boolean canceled = false;
-
-  private static final PersistentResult instance = new PersistentResult();
-
-  public static PersistentResult getInstance() {
-    return instance;
-  }
-
-  public void onAdded() {
-    synchronized (ADDED_LOCK) {
-      this.added = true;
-      this.ADDED_LOCK.notifyAll();
-    }
-  }
-
-  public void onRun() throws Throwable {
-    synchronized (RAN_LOCK) {
-      this.ran = true;
-    }
-  }
-
-  public void onCanceled() {
-    synchronized (CANCELED_LOCK) {
-      this.canceled = true;
-    }
-  }
-
-  public boolean isAdded() throws InterruptedException {
-    synchronized (ADDED_LOCK) {
-      if (!added) ADDED_LOCK.wait(1000);
-      return added;
-    }
-  }
-
-  public boolean isRan() throws InterruptedException {
-    synchronized (RAN_LOCK) {
-      if (!ran) RAN_LOCK.wait(1000);
-      return ran;
-    }
-  }
-
-  public boolean isCanceled() throws InterruptedException {
-    synchronized (CANCELED_LOCK) {
-      if (!canceled) CANCELED_LOCK.wait(1000);
-      return canceled;
-    }
-  }
-
-  public void reset() {
-    synchronized (ADDED_LOCK) {
-      this.added = false;
-    }
-
-    synchronized (RAN_LOCK) {
-      this.ran = false;
-    }
-
-    synchronized (CANCELED_LOCK) {
-      this.canceled = false;
-    }
-  }
-
-}

jobqueue/src/androidTest/java/org/whispersystems/jobqueue/util/RunnableThrowable.java

@@ -1,8 +0,0 @@
-package org.whispersystems.jobqueue.util;
-
-public interface RunnableThrowable {
-
-  public void run() throws Throwable;
-
-  public void shouldThrow(Boolean value);
-}

jobqueue/src/main/AndroidManifest.xml

@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.whispersystems.jobqueue">
-
-    <application />
-
-</manifest>

jobqueue/src/main/java/org/whispersystems/jobqueue/Job.java

@@ -1,89 +0,0 @@
-/**
- * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.jobqueue;
-
-import org.whispersystems.jobqueue.requirements.Requirement;
-
-import java.io.Serializable;
-import java.util.List;
-
-public abstract class Job implements Serializable {
-
-  private final JobParameters parameters;
-
-  private transient long persistentId;
-  private transient int  runIteration;
-
-  public Job(JobParameters parameters) {
-    this.parameters = parameters;
-  }
-
-  public List<Requirement> getRequirements() {
-    return parameters.getRequirements();
-  }
-
-  public boolean isRequirementsMet() {
-    for (Requirement requirement : parameters.getRequirements()) {
-      if (!requirement.isPresent()) return false;
-    }
-
-    return true;
-  }
-
-  public String getGroupId() {
-    return parameters.getGroupId();
-  }
-
-  public boolean isPersistent() {
-    return parameters.isPersistent();
-  }
-
-  public EncryptionKeys getEncryptionKeys() {
-    return parameters.getEncryptionKeys();
-  }
-
-  public void setEncryptionKeys(EncryptionKeys keys) {
-    parameters.setEncryptionKeys(keys);
-  }
-
-  public int getRetryCount() {
-    return parameters.getRetryCount();
-  }
-
-  public void setPersistentId(long persistentId) {
-    this.persistentId = persistentId;
-  }
-
-  public long getPersistentId() {
-    return persistentId;
-  }
-
-  public int getRunIteration() {
-    return runIteration;
-  }
-
-  public void setRunIteration(int runIteration) {
-    this.runIteration = runIteration;
-  }
-
-  public abstract void onAdded();
-  public abstract void onRun() throws Throwable;
-  public abstract void onCanceled();
-  public abstract boolean onShouldRetry(Throwable throwable);
-
-
-}

jobqueue/src/main/java/org/whispersystems/jobqueue/JobConsumer.java

@@ -1,84 +0,0 @@
-/**
- * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.jobqueue;
-
-import org.whispersystems.jobqueue.persistence.PersistentStorage;
-
-public class JobConsumer extends Thread {
-
-  enum JobResult {
-    SUCCESS,
-    FAILURE,
-    DEFERRED
-  }
-
-  private final JobQueue          jobQueue;
-  private final PersistentStorage persistentStorage;
-
-  public JobConsumer(String name, JobQueue jobQueue, PersistentStorage persistentStorage) {
-    super(name);
-    this.jobQueue          = jobQueue;
-    this.persistentStorage = persistentStorage;
-  }
-
-  @Override
-  public void run() {
-    while (true) {
-      Job job = jobQueue.getNext();
-
-      JobResult result;
-
-      if ((result = runJob(job)) != JobResult.DEFERRED) {
-        if (result == JobResult.FAILURE) {
-          job.onCanceled();
-        }
-
-        if (job.isPersistent()) {
-          persistentStorage.remove(job.getPersistentId());
-        }
-      } else {
-        jobQueue.add(job);
-      }
-
-      if (job.getGroupId() != null) {
-        jobQueue.setGroupIdAvailable(job.getGroupId());
-      }
-    }
-  }
-
-  private JobResult runJob(Job job) {
-    int retryCount   = job.getRetryCount();
-    int runIteration = job.getRunIteration();
-
-    for (;runIteration<retryCount;runIteration++) {
-      try {
-        job.onRun();
-        return JobResult.SUCCESS;
-      } catch (Throwable throwable) {
-        if (!job.onShouldRetry(throwable)) {
-          return JobResult.FAILURE;
-        } else if (!job.isRequirementsMet()) {
-          job.setRunIteration(runIteration+1);
-          return JobResult.DEFERRED;
-        }
-      }
-    }
-
-    return JobResult.FAILURE;
-  }
-
-}

jobqueue/src/main/java/org/whispersystems/jobqueue/JobManager.java

@@ -1,111 +0,0 @@
-/**
- * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.jobqueue;
-
-import android.content.Context;
-import android.util.Log;
-
-import org.whispersystems.jobqueue.persistence.JobSerializer;
-import org.whispersystems.jobqueue.persistence.PersistentStorage;
-import org.whispersystems.jobqueue.requirements.RequirementListener;
-import org.whispersystems.jobqueue.requirements.RequirementProvider;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class JobManager implements RequirementListener {
-
-  private final JobQueue      jobQueue           = new JobQueue();
-  private final Executor      eventExecutor      = Executors.newSingleThreadExecutor();
-  private final AtomicBoolean hasLoadedEncrypted = new AtomicBoolean(false);
-
-  private final PersistentStorage  persistentStorage;
-
-  public JobManager(Context context, String name,
-                    RequirementProvider requirementProvider,
-                    JobSerializer jobSerializer, int consumers)
-  {
-    this.persistentStorage = new PersistentStorage(context, name, jobSerializer);
-    eventExecutor.execute(new LoadTask(null));
-
-    if (requirementProvider != null) {
-      requirementProvider.setListener(this);
-    }
-
-    for (int i=0;i<consumers;i++) {
-      new JobConsumer("JobConsumer-" + i, jobQueue, persistentStorage).start();
-    }
-  }
-
-  public void setEncryptionKeys(EncryptionKeys keys) {
-    if (hasLoadedEncrypted.compareAndSet(false, true)) {
-      eventExecutor.execute(new LoadTask(keys));
-    }
-  }
-
-  public void add(final Job job) {
-    eventExecutor.execute(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          if (job.isPersistent()) {
-            persistentStorage.store(job);
-          }
-
-          job.onAdded();
-          jobQueue.add(job);
-        } catch (IOException e) {
-          Log.w("JobManager", e);
-          job.onCanceled();
-        }
-      }
-    });
-  }
-
-  @Override
-  public void onRequirementStatusChanged() {
-    eventExecutor.execute(new Runnable() {
-      @Override
-      public void run() {
-        jobQueue.onRequirementStatusChanged();
-      }
-    });
-  }
-
-  private class LoadTask implements Runnable {
-
-    private final EncryptionKeys keys;
-
-    public LoadTask(EncryptionKeys keys) {
-      this.keys = keys;
-    }
-
-    @Override
-    public void run() {
-      List<Job> pendingJobs;
-
-      if (keys == null) pendingJobs = persistentStorage.getAllUnencrypted();
-      else              pendingJobs = persistentStorage.getAllEncrypted(keys);
-
-      jobQueue.addAll(pendingJobs);
-    }
-  }
-
-}

jobqueue/src/main/java/org/whispersystems/jobqueue/JobParameters.java

@@ -1,110 +0,0 @@
-/**
- * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.jobqueue;
-
-import org.whispersystems.jobqueue.requirements.Requirement;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-
-public class JobParameters implements Serializable {
-
-  private transient EncryptionKeys encryptionKeys;
-
-  private final List<Requirement> requirements;
-  private final boolean           isPersistent;
-  private final int               retryCount;
-  private final String            groupId;
-
-  private JobParameters(List<Requirement> requirements,
-                       boolean isPersistent, String groupId,
-                       EncryptionKeys encryptionKeys,
-                       int retryCount)
-  {
-    this.requirements   = requirements;
-    this.isPersistent   = isPersistent;
-    this.groupId        = groupId;
-    this.encryptionKeys = encryptionKeys;
-    this.retryCount     = retryCount;
-  }
-
-  public List<Requirement> getRequirements() {
-    return requirements;
-  }
-
-  public boolean isPersistent() {
-    return isPersistent;
-  }
-
-  public EncryptionKeys getEncryptionKeys() {
-    return encryptionKeys;
-  }
-
-  public void setEncryptionKeys(EncryptionKeys encryptionKeys) {
-    this.encryptionKeys = encryptionKeys;
-  }
-
-  public int getRetryCount() {
-    return retryCount;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public String getGroupId() {
-    return groupId;
-  }
-
-  public static class Builder {
-    private List<Requirement> requirements   = new LinkedList<>();
-    private boolean           isPersistent   = false;
-    private EncryptionKeys    encryptionKeys = null;
-    private int               retryCount     = 100;
-    private String            groupId        = null;
-
-    public Builder withRequirement(Requirement requirement) {
-      this.requirements.add(requirement);
-      return this;
-    }
-
-    public Builder withPersistence() {
-      this.isPersistent = true;
-      return this;
-    }
-
-    public Builder withEncryption(EncryptionKeys encryptionKeys) {
-      this.encryptionKeys = encryptionKeys;
-      return this;
-    }
-
-    public Builder withRetryCount(int retryCount) {
-      this.retryCount = retryCount;
-      return this;
-    }
-
-    public Builder withGroupId(String groupId) {
-      this.groupId = groupId;
-      return this;
-    }
-
-    public JobParameters create() {
-      return new JobParameters(requirements, isPersistent, groupId, encryptionKeys, retryCount);
-    }
-  }
-}

jobqueue/src/main/java/org/whispersystems/jobqueue/JobQueue.java

@@ -1,93 +0,0 @@
-/**
- * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.jobqueue;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-
-public class JobQueue {
-
-  private final Set<String>     activeGroupIds = new HashSet<>();
-  private final LinkedList<Job> jobQueue       = new LinkedList<>();
-
-  public synchronized void onRequirementStatusChanged() {
-    notifyAll();
-  }
-
-  public synchronized void add(Job job) {
-    jobQueue.add(job);
-    notifyAll();
-  }
-
-  public synchronized void addAll(List<Job> jobs) {
-    jobQueue.addAll(jobs);
-    notifyAll();
-  }
-
-  public synchronized Job getNext() {
-    try {
-      Job nextAvailableJob;
-
-      while ((nextAvailableJob = getNextAvailableJob()) == null) {
-        wait();
-      }
-
-      return nextAvailableJob;
-    } catch (InterruptedException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  public synchronized void setGroupIdAvailable(String groupId) {
-    if (groupId != null) {
-      activeGroupIds.remove(groupId);
-      notifyAll();
-    }
-  }
-
-  private Job getNextAvailableJob() {
-    if (jobQueue.isEmpty()) return null;
-
-    ListIterator<Job> iterator = jobQueue.listIterator();
-    while (iterator.hasNext()) {
-      Job job = iterator.next();
-
-      if (job.isRequirementsMet() && isGroupIdAvailable(job.getGroupId())) {
-        iterator.remove();
-        setGroupIdUnavailable(job.getGroupId());
-        return job;
-      }
-    }
-
-    return null;
-  }
-
-  private boolean isGroupIdAvailable(String groupId) {
-    return groupId == null || !activeGroupIds.contains(groupId);
-  }
-
-  private void setGroupIdUnavailable(String groupId) {
-    if (groupId != null) {
-      activeGroupIds.add(groupId);
-    }
-  }
-}

jobqueue/src/main/java/org/whispersystems/jobqueue/persistence/JavaJobSerializer.java

@@ -1,75 +0,0 @@
-/**
- * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.jobqueue.persistence;
-
-import android.content.Context;
-import android.util.Base64;
-
-import org.whispersystems.jobqueue.EncryptionKeys;
-import org.whispersystems.jobqueue.Job;
-import org.whispersystems.jobqueue.dependencies.ContextDependent;
-import org.whispersystems.jobqueue.requirements.Requirement;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-public class JavaJobSerializer implements JobSerializer {
-
-  private final Context context;
-
-  public JavaJobSerializer(Context context) {
-    this.context = context;
-  }
-
-  @Override
-  public String serialize(Job job) throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ObjectOutputStream    oos  = new ObjectOutputStream(baos);
-    oos.writeObject(job);
-
-    return Base64.encodeToString(baos.toByteArray(), Base64.NO_WRAP);
-  }
-
-  @Override
-  public Job deserialize(EncryptionKeys keys, boolean encrypted, String serialized) throws IOException {
-    try {
-      ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decode(serialized, Base64.NO_WRAP));
-      ObjectInputStream    ois  = new ObjectInputStream(bais);
-
-      Job job = (Job)ois.readObject();
-
-      if (job instanceof ContextDependent) {
-        ((ContextDependent)job).setContext(context);
-      }
-
-      for (Requirement requirement : job.getRequirements()) {
-        if (requirement instanceof ContextDependent) {
-          ((ContextDependent)requirement).setContext(context);
-        }
-      }
-
-      job.setEncryptionKeys(keys);
-
-      return job;
-    } catch (ClassNotFoundException e) {
-      throw new IOException(e);
-    }
-  }
-}

jobqueue/src/main/java/org/whispersystems/jobqueue/persistence/PersistentStorage.java

@@ -1,128 +0,0 @@
-/**
- * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.jobqueue.persistence;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-
-import org.whispersystems.jobqueue.EncryptionKeys;
-import org.whispersystems.jobqueue.Job;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-public class PersistentStorage {
-
-  private static final int DATABASE_VERSION = 1;
-
-  private static final String TABLE_NAME = "queue";
-  private static final String ID         = "_id";
-  private static final String ITEM       = "item";
-  private static final String ENCRYPTED  = "encrypted";
-
-  private static final String DATABASE_CREATE = String.format("CREATE TABLE %s (%s INTEGER PRIMARY KEY, %s TEXT NOT NULL, %s INTEGER DEFAULT 0);",
-                                                              TABLE_NAME, ID, ITEM, ENCRYPTED);
-
-  private final DatabaseHelper databaseHelper;
-  private final JobSerializer jobSerializer;
-
-  public PersistentStorage(Context context, String name, JobSerializer serializer) {
-    this.databaseHelper = new DatabaseHelper(context, "_jobqueue-" + name);
-    this.jobSerializer  = serializer;
-  }
-
-  public void store(Job job) throws IOException {
-    ContentValues contentValues = new ContentValues();
-    contentValues.put(ITEM, jobSerializer.serialize(job));
-    contentValues.put(ENCRYPTED, job.getEncryptionKeys() != null);
-
-    long id = databaseHelper.getWritableDatabase().insert(TABLE_NAME, null, contentValues);
-    job.setPersistentId(id);
-  }
-
-//  public List<Job> getAll(EncryptionKeys keys) {
-//    return getJobs(keys, null);
-//  }
-
-  public List<Job> getAllUnencrypted() {
-    return getJobs(null, ENCRYPTED + " = 0");
-  }
-
-  public List<Job> getAllEncrypted(EncryptionKeys keys) {
-    return getJobs(keys, ENCRYPTED + " = 1");
-  }
-
-  private List<Job> getJobs(EncryptionKeys keys, String where) {
-    List<Job>      results  = new LinkedList<>();
-    SQLiteDatabase database = databaseHelper.getReadableDatabase();
-    Cursor         cursor   = null;
-
-    try {
-      cursor = database.query(TABLE_NAME, null, where, null, null, null, ID + " ASC", null);
-
-      while (cursor.moveToNext()) {
-        long    id        = cursor.getLong(cursor.getColumnIndexOrThrow(ID));
-        String  item      = cursor.getString(cursor.getColumnIndexOrThrow(ITEM));
-        boolean encrypted = cursor.getInt(cursor.getColumnIndexOrThrow(ENCRYPTED)) == 1;
-
-        try{
-          Job job = jobSerializer.deserialize(keys, encrypted, item);
-
-          job.setPersistentId(id);
-          results.add(job);
-        } catch (IOException e) {
-          Log.w("PersistentStore", e);
-          remove(id);
-        }
-      }
-    } finally {
-      if (cursor != null)
-        cursor.close();
-    }
-
-    return results;
-  }
-
-
-  public void remove(long id) {
-    databaseHelper.getWritableDatabase()
-                  .delete(TABLE_NAME, ID + " = ?", new String[] {String.valueOf(id)});
-  }
-
-  private static class DatabaseHelper extends SQLiteOpenHelper {
-
-    public DatabaseHelper(Context context, String name) {
-      super(context, name, null, DATABASE_VERSION);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-      db.execSQL(DATABASE_CREATE);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
-    }
-  }
-
-}

jobqueue/src/main/java/org/whispersystems/jobqueue/requirements/NetworkRequirement.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.jobqueue.requirements;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-
-import org.whispersystems.jobqueue.dependencies.ContextDependent;
-
-public class NetworkRequirement implements Requirement, ContextDependent {
-
-  private transient Context context;
-
-  public NetworkRequirement(Context context) {
-    this.context = context;
-  }
-
-  public NetworkRequirement() {}
-
-  @Override
-  public boolean isPresent() {
-    ConnectivityManager cm      = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-    NetworkInfo         netInfo = cm.getActiveNetworkInfo();
-
-    return netInfo != null && netInfo.isConnectedOrConnecting();
-  }
-
-  @Override
-  public void setContext(Context context) {
-    this.context = context;
-  }
-}

jobqueue/src/main/java/org/whispersystems/jobqueue/requirements/NetworkRequirementProvider.java

@@ -1,54 +0,0 @@
-/**
- * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.jobqueue.requirements;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-
-public class NetworkRequirementProvider implements RequirementProvider {
-
-  private RequirementListener listener;
-
-  private final NetworkRequirement requirement;
-
-  public NetworkRequirementProvider(Context context) {
-    this.requirement = new NetworkRequirement(context);
-
-    context.getApplicationContext().registerReceiver(new BroadcastReceiver() {
-      @Override
-      public void onReceive(Context context, Intent intent) {
-        if (listener == null) {
-          return;
-        }
-
-        if (requirement.isPresent()) {
-          listener.onRequirementStatusChanged();
-        }
-      }
-    }, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
-  }
-
-  @Override
-  public void setListener(RequirementListener listener) {
-    this.listener = listener;
-  }
-
-}

jobqueue/src/main/res/values/strings.xml

@@ -1,2 +0,0 @@
-<resources>
-</resources>

libaxolotl/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:0.14.2'
     }
 }
 
@@ -19,8 +19,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 21
+    buildToolsVersion '21.1.1'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

libaxolotl/src/androidTest/java/org/whispersystems/test/SessionBuilderTest.java

@@ -3,7 +3,6 @@ package org.whispersystems.test;
 import android.test.AndroidTestCase;
 
 import org.whispersystems.libaxolotl.DuplicateMessageException;
-import org.whispersystems.libaxolotl.IdentityKey;
 import org.whispersystems.libaxolotl.InvalidKeyException;
 import org.whispersystems.libaxolotl.InvalidKeyIdException;
 import org.whispersystems.libaxolotl.InvalidMessageException;
@@ -24,10 +23,7 @@ import org.whispersystems.libaxolotl.state.AxolotlStore;
 import org.whispersystems.libaxolotl.state.IdentityKeyStore;
 import org.whispersystems.libaxolotl.state.PreKeyBundle;
 import org.whispersystems.libaxolotl.state.PreKeyRecord;
-import org.whispersystems.libaxolotl.state.PreKeyStore;
-import org.whispersystems.libaxolotl.state.SessionStore;
 import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
-import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
 import org.whispersystems.libaxolotl.util.Pair;
 
 import java.util.HashSet;
@@ -122,11 +118,11 @@ public class SessionBuilderTest extends AndroidTestCase {
     AxolotlStore   aliceStore          = new InMemoryAxolotlStore();
     SessionBuilder aliceSessionBuilder = new SessionBuilder(aliceStore, BOB_RECIPIENT_ID, 1);
 
-    AxolotlStore bobStore                 = new InMemoryAxolotlStore();
-    ECKeyPair    bobPreKeyPair            = Curve.generateKeyPair();
-    ECKeyPair    bobSignedPreKeyPair      = Curve.generateKeyPair();
-    byte[]       bobSignedPreKeySignature = Curve.calculateSignature(bobStore.getIdentityKeyPair().getPrivateKey(),
-                                                                     bobSignedPreKeyPair.getPublicKey().serialize());
+    final AxolotlStore bobStore                 = new InMemoryAxolotlStore();
+          ECKeyPair    bobPreKeyPair            = Curve.generateKeyPair();
+          ECKeyPair    bobSignedPreKeyPair      = Curve.generateKeyPair();
+          byte[]       bobSignedPreKeySignature = Curve.calculateSignature(bobStore.getIdentityKeyPair().getPrivateKey(),
+                                                                           bobSignedPreKeyPair.getPublicKey().serialize());
 
     PreKeyBundle bobPreKey = new PreKeyBundle(bobStore.getLocalRegistrationId(), 1,
                                               31337, bobPreKeyPair.getPublicKey(),
@@ -139,9 +135,9 @@ public class SessionBuilderTest extends AndroidTestCase {
     assertTrue(aliceStore.containsSession(BOB_RECIPIENT_ID, 1));
     assertTrue(aliceStore.loadSession(BOB_RECIPIENT_ID, 1).getSessionState().getSessionVersion() == 3);
 
-    String            originalMessage    = "L'homme est condamné à être libre";
-    SessionCipher     aliceSessionCipher = new SessionCipher(aliceStore, BOB_RECIPIENT_ID, 1);
-    CiphertextMessage outgoingMessage    = aliceSessionCipher.encrypt(originalMessage.getBytes());
+    final String            originalMessage    = "L'homme est condamné à être libre";
+          SessionCipher     aliceSessionCipher = new SessionCipher(aliceStore, BOB_RECIPIENT_ID, 1);
+          CiphertextMessage outgoingMessage    = aliceSessionCipher.encrypt(originalMessage.getBytes());
 
     assertTrue(outgoingMessage.getType() == CiphertextMessage.PREKEY_TYPE);
 
@@ -150,8 +146,13 @@ public class SessionBuilderTest extends AndroidTestCase {
     bobStore.storeSignedPreKey(22, new SignedPreKeyRecord(22, System.currentTimeMillis(), bobSignedPreKeyPair, bobSignedPreKeySignature));
 
     SessionCipher bobSessionCipher = new SessionCipher(bobStore, ALICE_RECIPIENT_ID, 1);
-    byte[]        plaintext        = bobSessionCipher.decrypt(incomingMessage);
-
+    byte[] plaintext = bobSessionCipher.decrypt(incomingMessage, new SessionCipher.DecryptionCallback() {
+      @Override
+      public void handlePlaintext(byte[] plaintext) {
+        assertTrue(originalMessage.equals(new String(plaintext)));
+        assertFalse(bobStore.containsSession(ALICE_RECIPIENT_ID, 1));
+      }
+    });
 
     assertTrue(bobStore.containsSession(ALICE_RECIPIENT_ID, 1));
     assertTrue(bobStore.loadSession(ALICE_RECIPIENT_ID, 1).getSessionState().getSessionVersion() == 3);

libaxolotl/src/androidTest/java/org/whispersystems/test/SessionCipherTest.java

@@ -19,12 +19,8 @@ import org.whispersystems.libaxolotl.ratchet.AliceAxolotlParameters;
 import org.whispersystems.libaxolotl.ratchet.BobAxolotlParameters;
 import org.whispersystems.libaxolotl.ratchet.RatchetingSession;
 import org.whispersystems.libaxolotl.state.AxolotlStore;
-import org.whispersystems.libaxolotl.state.IdentityKeyStore;
-import org.whispersystems.libaxolotl.state.PreKeyStore;
 import org.whispersystems.libaxolotl.state.SessionRecord;
 import org.whispersystems.libaxolotl.state.SessionState;
-import org.whispersystems.libaxolotl.state.SessionStore;
-import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
 import java.security.NoSuchAlgorithmException;

libaxolotl/src/main/java/org/whispersystems/libaxolotl/SessionCipher.java

@@ -138,6 +138,7 @@ public class SessionCipher {
    * Decrypt a message.
    *
    * @param  ciphertext The {@link PreKeyWhisperMessage} to decrypt.
+   *
    * @return The plaintext.
    * @throws InvalidMessageException if the input is not valid ciphertext.
    * @throws DuplicateMessageException if the input is a message that has already been received.
@@ -147,17 +148,46 @@ public class SessionCipher {
    *                               that corresponds to the PreKey ID in the message.
    * @throws InvalidKeyException when the message is formatted incorrectly.
    * @throws UntrustedIdentityException when the {@link IdentityKey} of the sender is untrusted.
-
    */
   public byte[] decrypt(PreKeyWhisperMessage ciphertext)
       throws DuplicateMessageException, LegacyMessageException, InvalidMessageException,
              InvalidKeyIdException, InvalidKeyException, UntrustedIdentityException
+  {
+    return decrypt(ciphertext, new NullDecryptionCallback());
+  }
+
+  /**
+   * Decrypt a message.
+   *
+   * @param  ciphertext The {@link PreKeyWhisperMessage} to decrypt.
+   * @param  callback   A callback that is triggered after decryption is complete,
+   *                    but before the updated session state has been committed to the session
+   *                    DB.  This allows some implementations to store the committed plaintext
+   *                    to a DB first, in case they are concerned with a crash happening between
+   *                    the time the session state is updated but before they're able to store
+   *                    the plaintext to disk.
+   *
+   * @return The plaintext.
+   * @throws InvalidMessageException if the input is not valid ciphertext.
+   * @throws DuplicateMessageException if the input is a message that has already been received.
+   * @throws LegacyMessageException if the input is a message formatted by a protocol version that
+   *                                is no longer supported.
+   * @throws InvalidKeyIdException when there is no local {@link org.whispersystems.libaxolotl.state.PreKeyRecord}
+   *                               that corresponds to the PreKey ID in the message.
+   * @throws InvalidKeyException when the message is formatted incorrectly.
+   * @throws UntrustedIdentityException when the {@link IdentityKey} of the sender is untrusted.
+   */
+  public byte[] decrypt(PreKeyWhisperMessage ciphertext, DecryptionCallback callback)
+      throws DuplicateMessageException, LegacyMessageException, InvalidMessageException,
+             InvalidKeyIdException, InvalidKeyException, UntrustedIdentityException
   {
     synchronized (SESSION_LOCK) {
       SessionRecord     sessionRecord    = sessionStore.loadSession(recipientId, deviceId);
       Optional<Integer> unsignedPreKeyId = sessionBuilder.process(sessionRecord, ciphertext);
       byte[]            plaintext        = decrypt(sessionRecord, ciphertext.getWhisperMessage());
 
+      callback.handlePlaintext(plaintext);
+
       sessionStore.storeSession(recipientId, deviceId, sessionRecord);
 
       if (unsignedPreKeyId.isPresent()) {
@@ -168,7 +198,6 @@ public class SessionCipher {
     }
   }
 
-
   /**
    * Decrypt a message.
    *
@@ -182,6 +211,31 @@ public class SessionCipher {
    * @throws NoSessionException if there is no established session for this contact.
    */
   public byte[] decrypt(WhisperMessage ciphertext)
+      throws InvalidMessageException, DuplicateMessageException, LegacyMessageException,
+      NoSessionException
+  {
+    return decrypt(ciphertext, new NullDecryptionCallback());
+  }
+
+  /**
+   * Decrypt a message.
+   *
+   * @param  ciphertext The {@link WhisperMessage} to decrypt.
+   * @param  callback   A callback that is triggered after decryption is complete,
+   *                    but before the updated session state has been committed to the session
+   *                    DB.  This allows some implementations to store the committed plaintext
+   *                    to a DB first, in case they are concerned with a crash happening between
+   *                    the time the session state is updated but before they're able to store
+   *                    the plaintext to disk.
+   *
+   * @return The plaintext.
+   * @throws InvalidMessageException if the input is not valid ciphertext.
+   * @throws DuplicateMessageException if the input is a message that has already been received.
+   * @throws LegacyMessageException if the input is a message formatted by a protocol version that
+   *                                is no longer supported.
+   * @throws NoSessionException if there is no established session for this contact.
+   */
+  public byte[] decrypt(WhisperMessage ciphertext, DecryptionCallback callback)
       throws InvalidMessageException, DuplicateMessageException, LegacyMessageException,
              NoSessionException
   {
@@ -194,6 +248,8 @@ public class SessionCipher {
       SessionRecord sessionRecord = sessionStore.loadSession(recipientId, deviceId);
       byte[]        plaintext     = decrypt(sessionRecord, ciphertext);
 
+      callback.handlePlaintext(plaintext);
+
       sessionStore.storeSession(recipientId, deviceId, sessionRecord);
 
       return plaintext;
@@ -274,6 +330,17 @@ public class SessionCipher {
     }
   }
 
+  public int getSessionVersion() {
+    synchronized (SESSION_LOCK) {
+      if (!sessionStore.containsSession(recipientId, deviceId)) {
+        throw new IllegalStateException(String.format("No session for (%d, %d)!", recipientId, deviceId));
+      }
+
+      SessionRecord record = sessionStore.loadSession(recipientId, deviceId);
+      return record.getSessionState().getSessionVersion();
+    }
+  }
+
   private ChainKey getOrCreateChainKey(SessionState sessionState, ECPublicKey theirEphemeral)
       throws InvalidMessageException
   {
@@ -313,7 +380,7 @@ public class SessionCipher {
       }
     }
 
-    if (chainKey.getIndex() - counter > 2000) {
+    if (counter - chainKey.getIndex() > 2000) {
       throw new InvalidMessageException("Over 2000 messages into the future!");
     }
 
@@ -390,4 +457,13 @@ public class SessionCipher {
       throw new AssertionError(e);
     }
   }
+
+  public static interface DecryptionCallback {
+    public void handlePlaintext(byte[] plaintext);
+  }
+
+  private static class NullDecryptionCallback implements DecryptionCallback {
+    @Override
+    public void handlePlaintext(byte[] plaintext) {}
+  }
 }

library/build.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="library" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties"/>
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties"/>
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env"/>
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME"/>
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties"/>
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-            />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true"/>
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml"/>
-
-</project>

library/proguard-project.txt

@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

library/protobuf/Makefile

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

library/res/values/strings.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>

library/src/org/whispersystems/textsecure/crypto/AttachmentCipher.java

@@ -1,161 +0,0 @@
-/**
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.textsecure.crypto;
-
-import android.util.Log;
-
-import org.whispersystems.libaxolotl.InvalidMacException;
-import org.whispersystems.libaxolotl.InvalidMessageException;
-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.text.ParseException;
-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    = 32;
-
-  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], "HmacSHA256");
-    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);
-    } catch (ParseException e) {
-      throw new InvalidMessageException(e);
-    }
-  }
-
-  private Mac initializeMac() {
-    try {
-      Mac mac = Mac.getInstance("HmacSHA256");
-      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, "HmacSHA256");
-  }
-
-}

library/src/org/whispersystems/textsecure/crypto/TransportDetails.java

@@ -1,28 +0,0 @@
-/** 
- * Copyright (C) 2011 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.textsecure.crypto;
-
-import java.io.IOException;
-
-
-public interface TransportDetails {	
-  public byte[] getStrippedPaddingMessageBody(byte[] messageWithPadding);
-  public byte[] getPaddedMessageBody(byte[] messageBody);
-
-  public byte[] getEncodedMessage(byte[] messageWithMac);
-  public byte[] getDecodedMessage(byte[] encodedMessageBytes) throws IOException;
-}

library/src/org/whispersystems/textsecure/directory/BloomFilter.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2011 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 <http://www.gnu.org/licenses/>.
- */
-
-package org.whispersystems.textsecure.directory;
-
-import org.whispersystems.textsecure.util.Conversions;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * A simple bloom filter implementation that backs the RedPhone directory.
- *
- * @author Moxie Marlinspike
- *
- */
-
-public class BloomFilter {
-
-  private final MappedByteBuffer buffer;
-  private final long length;
-  private final int hashCount;
-
-  public BloomFilter(File bloomFilter, int hashCount)
-      throws IOException
-  {
-    this.length    = bloomFilter.length();
-    this.buffer    = new FileInputStream(bloomFilter).getChannel()
-                                                     .map(FileChannel.MapMode.READ_ONLY, 0, length);
-    this.hashCount = hashCount;
-  }
-
-  public int getHashCount() {
-    return hashCount;
-  }
-
-  private boolean isBitSet(long bitIndex) {
-    int byteInQuestion = this.buffer.get((int)(bitIndex / 8));
-    int bitOffset      = (0x01 << (bitIndex % 8));
-
-    return (byteInQuestion & bitOffset) > 0;
-  }
-
-  public boolean contains(String entity) {
-    try {
-      for (int i=0;i<this.hashCount;i++) {
-        Mac mac = Mac.getInstance("HmacSHA1");
-        mac.init(new SecretKeySpec((i+"").getBytes(), "HmacSHA1"));
-
-        byte[] hashValue = mac.doFinal(entity.getBytes());
-        long bitIndex    = Math.abs(Conversions.byteArrayToLong(hashValue, 0)) % (this.length * 8);
-
-        if (!isBitSet(bitIndex))
-          return false;
-      }
-
-      return true;
-    } catch (NoSuchAlgorithmException e) {
-      throw new AssertionError(e);
-    } catch (InvalidKeyException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-}

library/src/org/whispersystems/textsecure/directory/DirectoryDescriptor.java

@@ -1,26 +0,0 @@
-package org.whispersystems.textsecure.directory;
-
-public class DirectoryDescriptor {
-  private String version;
-  private long capacity;
-  private int hashCount;
-
-  public String getUrl() {
-    return url;
-  }
-
-  public int getHashCount() {
-    return hashCount;
-  }
-
-  public long getCapacity() {
-    return capacity;
-  }
-
-  public String getVersion() {
-    return version;
-  }
-
-  private String url;
-
-}

library/src/org/whispersystems/textsecure/directory/NumberFilter.java

@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2011 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 <http://www.gnu.org/licenses/>.
- */
-
-package org.whispersystems.textsecure.directory;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.google.thoughtcrimegson.Gson;
-import com.google.thoughtcrimegson.JsonParseException;
-import com.google.thoughtcrimegson.annotations.SerializedName;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.zip.GZIPInputStream;
-
-/**
- * Handles providing lookups, serializing, and deserializing the RedPhone directory.
- *
- * @author Moxie Marlinspike
- *
- */
-
-public class NumberFilter {
-
-  private static NumberFilter instance;
-
-  public synchronized static NumberFilter getInstance(Context context) {
-    if (instance == null)
-      instance = NumberFilter.deserializeFromFile(context);
-
-    return instance;
-  }
-
-  private static final String DIRECTORY_META_FILE = "directory.stat";
-
-  private File bloomFilter;
-  private String version;
-  private long capacity;
-  private int hashCount;
-  private Context context;
-
-  private NumberFilter(Context context, File bloomFilter, long capacity,
-                       int hashCount, String version)
-  {
-    this.context     = context.getApplicationContext();
-    this.bloomFilter = bloomFilter;
-    this.capacity    = capacity;
-    this.hashCount   = hashCount;
-    this.version     = version;
-  }
-
-  public synchronized boolean containsNumber(String number) {
-    try {
-      if      (bloomFilter == null)                    return false;
-      else if (number == null || number.length() == 0) return false;
-
-      return new BloomFilter(bloomFilter, hashCount).contains(number);
-    } catch (IOException ioe) {
-      Log.w("NumberFilter", ioe);
-      return false;
-    }
-  }
-
-  public synchronized boolean containsNumbers(List<String> numbers) {
-    try {
-      if  (bloomFilter == null)                    return false;
-      if  (numbers == null || numbers.size() == 0) return false;
-
-      BloomFilter filter = new BloomFilter(bloomFilter, hashCount);
-
-      for (String number : numbers) {
-        if (!filter.contains(number)) {
-          return false;
-        }
-      }
-
-      return true;
-    } catch (IOException ioe) {
-      Log.w("NumberFilter", ioe);
-      return false;
-    }
-  }
-
-  public synchronized void update(DirectoryDescriptor descriptor, File compressedData) {
-    try {
-      File             uncompressed = File.createTempFile("directory", ".dat", context.getFilesDir());
-      FileInputStream  fin          = new FileInputStream (compressedData);
-      GZIPInputStream  gin          = new GZIPInputStream(fin);
-      FileOutputStream out          = new FileOutputStream(uncompressed);
-
-      byte[] buffer = new byte[4096];
-      int read;
-
-      while ((read = gin.read(buffer)) != -1) {
-        out.write(buffer, 0, read);
-      }
-
-      out.close();
-      compressedData.delete();
-
-      update(uncompressed, descriptor.getCapacity(), descriptor.getHashCount(), descriptor.getVersion());
-    } catch (IOException ioe) {
-      Log.w("NumberFilter", ioe);
-    }
-  }
-
-  private synchronized void update(File bloomFilter, long capacity, int hashCount, String version)
-  {
-    if (this.bloomFilter != null)
-      this.bloomFilter.delete();
-
-    this.bloomFilter = bloomFilter;
-    this.capacity    = capacity;
-    this.hashCount   = hashCount;
-    this.version     = version;
-
-    serializeToFile(context);
-  }
-
-  private void serializeToFile(Context context) {
-    if (this.bloomFilter == null)
-      return;
-
-    try {
-      FileOutputStream fout       = context.openFileOutput(DIRECTORY_META_FILE, 0);
-      NumberFilterStorage storage = new NumberFilterStorage(bloomFilter.getAbsolutePath(),
-                                                            capacity, hashCount, version);
-
-      storage.serializeToStream(fout);
-      fout.close();
-    } catch (IOException ioe) {
-      Log.w("NumberFilter", ioe);
-    }
-  }
-
-  private static NumberFilter deserializeFromFile(Context context) {
-    try {
-      FileInputStream fis         = context.openFileInput(DIRECTORY_META_FILE);
-      NumberFilterStorage storage = NumberFilterStorage.fromStream(fis);
-
-      if (storage == null) return new NumberFilter(context, null, 0, 0, "0");
-      else                 return new NumberFilter(context,
-                                                   new File(storage.getDataPath()),
-                                                   storage.getCapacity(),
-                                                   storage.getHashCount(),
-                                                   storage.getVersion());
-    } catch (IOException ioe) {
-      Log.w("NumberFilter", ioe);
-      return new NumberFilter(context, null, 0, 0, "0");
-    }
-  }
-
-  private static class NumberFilterStorage {
-    @SerializedName("data_path")
-    private String dataPath;
-
-    @SerializedName("capacity")
-    private long capacity;
-
-    @SerializedName("hash_count")
-    private int hashCount;
-
-    @SerializedName("version")
-    private String version;
-
-    public NumberFilterStorage(String dataPath, long capacity, int hashCount, String version) {
-      this.dataPath   = dataPath;
-      this.capacity   = capacity;
-      this.hashCount  = hashCount;
-      this.version    = version;
-    }
-
-    public String getDataPath() {
-      return dataPath;
-    }
-
-    public long getCapacity() {
-      return capacity;
-    }
-
-    public int getHashCount() {
-      return hashCount;
-    }
-
-    public String getVersion() {
-      return version;
-    }
-
-    public void serializeToStream(OutputStream out) throws IOException {
-      out.write(new Gson().toJson(this).getBytes());
-    }
-
-    public static NumberFilterStorage fromStream(InputStream in) throws IOException {
-      try {
-        return new Gson().fromJson(new BufferedReader(new InputStreamReader(in)),
-                                   NumberFilterStorage.class);
-      } catch (JsonParseException jpe) {
-        Log.w("NumberFilter", jpe);
-        throw new IOException("JSON Parse Exception");
-      }
-    }
-  }
-}

library/src/org/whispersystems/textsecure/push/AccountAttributes.java

@@ -1,28 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-public class AccountAttributes {
-
-  private String  signalingKey;
-  private boolean supportsSms;
-  private int     registrationId;
-
-  public AccountAttributes(String signalingKey, boolean supportsSms, int registrationId) {
-    this.signalingKey   = signalingKey;
-    this.supportsSms    = supportsSms;
-    this.registrationId = registrationId;
-  }
-
-  public AccountAttributes() {}
-
-  public String getSignalingKey() {
-    return signalingKey;
-  }
-
-  public boolean isSupportsSms() {
-    return supportsSms;
-  }
-
-  public int getRegistrationId() {
-    return registrationId;
-  }
-}

library/src/org/whispersystems/textsecure/push/ContactTokenDetails.java

@@ -1,33 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import com.google.thoughtcrimegson.Gson;
-
-public class ContactTokenDetails {
-
-  private String  token;
-  private String  relay;
-  private String  number;
-  private boolean supportsSms;
-
-  public ContactTokenDetails() {}
-
-  public String getToken() {
-    return token;
-  }
-
-  public String getRelay() {
-    return relay;
-  }
-
-  public boolean isSupportsSms() {
-    return supportsSms;
-  }
-
-  public void setNumber(String number) {
-    this.number = number;
-  }
-
-  public String getNumber() {
-    return number;
-  }
-}

library/src/org/whispersystems/textsecure/push/ContactTokenDetailsList.java

@@ -1,14 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import java.util.List;
-
-public class ContactTokenDetailsList {
-
-  private List<ContactTokenDetails> contacts;
-
-  public ContactTokenDetailsList() {}
-
-  public List<ContactTokenDetails> getContacts() {
-    return contacts;
-  }
-}

library/src/org/whispersystems/textsecure/push/ContactTokenList.java

@@ -1,18 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import java.util.List;
-
-public class ContactTokenList {
-
-  private List<String> contacts;
-
-  public ContactTokenList(List<String> contacts) {
-    this.contacts = contacts;
-  }
-
-  public ContactTokenList() {}
-
-  public List<String> getContacts() {
-    return contacts;
-  }
-}

library/src/org/whispersystems/textsecure/push/IncomingPushMessage.java

@@ -1,149 +0,0 @@
-/**
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.textsecure.push;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal;
-
-public class IncomingPushMessage implements Parcelable {
-
-  public static final Parcelable.Creator<IncomingPushMessage> CREATOR = new Parcelable.Creator<IncomingPushMessage>() {
-    @Override
-    public IncomingPushMessage createFromParcel(Parcel in) {
-      return new IncomingPushMessage(in);
-    }
-
-    @Override
-    public IncomingPushMessage[] newArray(int size) {
-      return new IncomingPushMessage[size];
-    }
-  };
-
-  private int          type;
-  private String       source;
-  private int          sourceDevice;
-  private byte[]       message;
-  private long         timestamp;
-  private String       relay;
-
-  private IncomingPushMessage(IncomingPushMessage message, byte[] body) {
-    this.type         = message.type;
-    this.source       = message.source;
-    this.sourceDevice = message.sourceDevice;
-    this.timestamp    = message.timestamp;
-    this.relay        = message.relay;
-    this.message      = body;
-  }
-
-  public IncomingPushMessage(IncomingPushMessageSignal signal) {
-    this.type         = signal.getType().getNumber();
-    this.source       = signal.getSource();
-    this.sourceDevice = signal.getSourceDevice();
-    this.message      = signal.getMessage().toByteArray();
-    this.timestamp    = signal.getTimestamp();
-    this.relay        = signal.getRelay();
-  }
-
-  public IncomingPushMessage(Parcel in) {
-    this.type         = in.readInt();
-    this.source       = in.readString();
-    this.sourceDevice = in.readInt();
-
-    if (in.readInt() == 1) {
-      this.relay  = in.readString();
-    }
-
-    this.message = new byte[in.readInt()];
-    in.readByteArray(this.message);
-    this.timestamp = in.readLong();
-  }
-
-  public IncomingPushMessage(int type, String source, int sourceDevice,
-                             byte[] body, long timestamp)
-  {
-    this.type         = type;
-    this.source       = source;
-    this.sourceDevice = sourceDevice;
-    this.message      = body;
-    this.timestamp    = timestamp;
-  }
-
-  public String getRelay() {
-    return relay;
-  }
-
-  public long getTimestampMillis() {
-    return timestamp;
-  }
-
-  public String getSource() {
-    return source;
-  }
-
-  public int getSourceDevice() {
-    return sourceDevice;
-  }
-
-  public byte[] getBody() {
-    return message;
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags) {
-    dest.writeInt(type);
-    dest.writeString(source);
-    dest.writeInt(sourceDevice);
-    dest.writeInt(relay == null ? 0 : 1);
-    if (relay != null) {
-      dest.writeString(relay);
-    }
-    dest.writeInt(message.length);
-    dest.writeByteArray(message);
-    dest.writeLong(timestamp);
-  }
-
-  public IncomingPushMessage withBody(byte[] body) {
-    return new IncomingPushMessage(this, body);
-  }
-
-  public int getType() {
-    return type;
-  }
-
-  public boolean isSecureMessage() {
-    return getType() == IncomingPushMessageSignal.Type.CIPHERTEXT_VALUE;
-  }
-
-  public boolean isPreKeyBundle() {
-    return getType() == IncomingPushMessageSignal.Type.PREKEY_BUNDLE_VALUE;
-  }
-
-  public boolean isReceipt() {
-    return getType() == IncomingPushMessageSignal.Type.RECEIPT_VALUE;
-  }
-
-  public boolean isPlaintext() {
-    return getType() == IncomingPushMessageSignal.Type.PLAINTEXT_VALUE;
-  }
-}

library/src/org/whispersystems/textsecure/push/MismatchedDevices.java

@@ -1,17 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import java.util.List;
-
-public class MismatchedDevices {
-  private List<Integer> missingDevices;
-
-  private List<Integer> extraDevices;
-
-  public List<Integer> getMissingDevices() {
-    return missingDevices;
-  }
-
-  public List<Integer> getExtraDevices() {
-    return extraDevices;
-  }
-}

library/src/org/whispersystems/textsecure/push/OutgoingPushMessageList.java

@@ -1,39 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import java.util.List;
-
-public class OutgoingPushMessageList {
-
-  private String destination;
-
-  private String relay;
-
-  private long timestamp;
-
-  private List<OutgoingPushMessage> messages;
-
-  public OutgoingPushMessageList(String destination, long timestamp, String relay,
-                                 List<OutgoingPushMessage> messages)
-  {
-    this.timestamp   = timestamp;
-    this.destination = destination;
-    this.relay       = relay;
-    this.messages    = messages;
-  }
-
-  public String getDestination() {
-    return destination;
-  }
-
-  public List<OutgoingPushMessage> getMessages() {
-    return messages;
-  }
-
-  public String getRelay() {
-    return relay;
-  }
-
-  public long getTimestamp() {
-    return timestamp;
-  }
-}

library/src/org/whispersystems/textsecure/push/PreKeyResponseItem.java

@@ -1,31 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import com.google.thoughtcrimegson.GsonBuilder;
-
-public class PreKeyResponseItem {
-
-  private int                deviceId;
-  private int                registrationId;
-  private SignedPreKeyEntity signedPreKey;
-  private PreKeyEntity       preKey;
-
-  public int getDeviceId() {
-    return deviceId;
-  }
-
-  public int getRegistrationId() {
-    return registrationId;
-  }
-
-  public SignedPreKeyEntity getSignedPreKey() {
-    return signedPreKey;
-  }
-
-  public PreKeyEntity getPreKey() {
-    return preKey;
-  }
-
-  public static GsonBuilder forBuilder(GsonBuilder builder) {
-    return SignedPreKeyEntity.forBuilder(builder);
-  }
-}

library/src/org/whispersystems/textsecure/push/PreKeyStatus.java

@@ -1,12 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-public class PreKeyStatus {
-
-  private int count;
-
-  public PreKeyStatus() {}
-
-  public int getCount() {
-    return count;
-  }
-}

library/src/org/whispersystems/textsecure/push/PushAddress.java

@@ -1,32 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import android.content.Context;
-
-import org.whispersystems.textsecure.directory.Directory;
-import org.whispersystems.textsecure.storage.RecipientDevice;
-
-public class PushAddress extends RecipientDevice {
-
-  private final String e164number;
-  private final String relay;
-
-  private PushAddress(long recipientId, String e164number, int deviceId, String relay) {
-    super(recipientId, deviceId);
-    this.e164number  = e164number;
-    this.relay       = relay;
-  }
-
-  public String getNumber() {
-    return e164number;
-  }
-
-  public String getRelay() {
-    return relay;
-  }
-
-  public static PushAddress create(Context context, long recipientId, String e164number, int deviceId) {
-    String relay = Directory.getInstance(context).getRelay(e164number);
-    return new PushAddress(recipientId, e164number, deviceId, relay);
-  }
-
-}

library/src/org/whispersystems/textsecure/push/PushAttachmentData.java

@@ -1,21 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-public class PushAttachmentData {
-
-  private final String contentType;
-  private final byte[] data;
-
-  public PushAttachmentData(String contentType, byte[] data) {
-    this.contentType = contentType;
-    this.data        = data;
-  }
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public byte[] getData() {
-    return data;
-  }
-
-}

library/src/org/whispersystems/textsecure/push/PushAttachmentPointer.java

@@ -1,63 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public class PushAttachmentPointer implements Parcelable {
-
-  public static final Parcelable.Creator<PushAttachmentPointer> CREATOR = new Parcelable.Creator<PushAttachmentPointer>() {
-    @Override
-    public PushAttachmentPointer createFromParcel(Parcel in) {
-      return new PushAttachmentPointer(in);
-    }
-
-    @Override
-    public PushAttachmentPointer[] newArray(int size) {
-      return new PushAttachmentPointer[size];
-    }
-  };
-
-  private final String contentType;
-  private final long   id;
-  private final byte[] 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.id          = in.readLong();
-
-    int keyLength = in.readInt();
-    this.key      = new byte[keyLength];
-    in.readByteArray(this.key);
-  }
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public long getId() {
-    return id;
-  }
-
-  public byte[] getKey() {
-    return key;
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags) {
-    dest.writeString(contentType);
-    dest.writeLong(id);
-    dest.writeInt(this.key.length);
-    dest.writeByteArray(this.key);
-  }
-}

library/src/org/whispersystems/textsecure/push/PushBody.java

@@ -1,26 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-public class PushBody {
-
-  private final int    type;
-  private final int    remoteRegistrationId;
-  private final byte[] body;
-
-  public PushBody(int type, int remoteRegistrationId, byte[] body) {
-    this.type                 = type;
-    this.remoteRegistrationId = remoteRegistrationId;
-    this.body                 = body;
-  }
-
-  public int getType() {
-    return type;
-  }
-
-  public byte[] getBody() {
-    return body;
-  }
-
-  public int getRemoteRegistrationId() {
-    return remoteRegistrationId;
-  }
-}

library/src/org/whispersystems/textsecure/push/PushMessageResponse.java

@@ -1,18 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import java.util.List;
-
-public class PushMessageResponse {
-  private List<String> success;
-  private List<String> failure;
-
-  public List<String> getSuccess() {
-    return success;
-  }
-
-  public List<String> getFailure() {
-    return failure;
-  }
-
-
-}

library/src/org/whispersystems/textsecure/push/RawTransportDetails.java

@@ -1,27 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import org.whispersystems.textsecure.crypto.TransportDetails;
-
-import java.io.IOException;
-
-public class RawTransportDetails implements TransportDetails {
-  @Override
-  public byte[] getStrippedPaddingMessageBody(byte[] messageWithPadding) {
-    return messageWithPadding;
-  }
-
-  @Override
-  public byte[] getPaddedMessageBody(byte[] messageBody) {
-    return messageBody;
-  }
-
-  @Override
-  public byte[] getEncodedMessage(byte[] messageWithMac) {
-    return messageWithMac;
-  }
-
-  @Override
-  public byte[] getDecodedMessage(byte[] encodedMessageBytes) throws IOException {
-    return encodedMessageBytes;
-  }
-}

library/src/org/whispersystems/textsecure/push/StaleDevices.java

@@ -1,12 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import java.util.List;
-
-public class StaleDevices {
-
-  private List<Integer> staleDevices;
-
-  public List<Integer> getStaleDevices() {
-    return staleDevices;
-  }
-}

library/src/org/whispersystems/textsecure/push/UnregisteredUserException.java

@@ -1,18 +0,0 @@
-package org.whispersystems.textsecure.push;
-
-import java.io.IOException;
-import java.util.List;
-
-public class UnregisteredUserException extends IOException {
-
-  private final String e164number;
-
-  public UnregisteredUserException(String e164number, Exception exception) {
-    super(exception);
-    this.e164number = e164number;
-  }
-
-  public String getE164Number() {
-    return e164number;
-  }
-}

library/src/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java

@@ -1,7 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-public class AuthorizationFailedException extends NonSuccessfulResponseCodeException {
-  public AuthorizationFailedException(String s) {
-    super(s);
-  }
-}

library/src/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java

@@ -1,4 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-public class ExpectationFailedException extends NonSuccessfulResponseCodeException {
-}

library/src/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java

@@ -1,16 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-import org.whispersystems.textsecure.push.MismatchedDevices;
-
-public class MismatchedDevicesException extends NonSuccessfulResponseCodeException {
-
-  private final MismatchedDevices mismatchedDevices;
-
-  public MismatchedDevicesException(MismatchedDevices mismatchedDevices) {
-    this.mismatchedDevices = mismatchedDevices;
-  }
-
-  public MismatchedDevices getMismatchedDevices() {
-    return mismatchedDevices;
-  }
-}

library/src/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java

@@ -1,14 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-import java.io.IOException;
-
-public class NonSuccessfulResponseCodeException extends IOException {
-
-  public NonSuccessfulResponseCodeException() {
-    super();
-  }
-
-  public NonSuccessfulResponseCodeException(String s) {
-    super(s);
-  }
-}

library/src/org/whispersystems/textsecure/push/exceptions/NotFoundException.java

@@ -1,9 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-
-public class NotFoundException extends NonSuccessfulResponseCodeException {
-  public NotFoundException(String s) {
-    super(s);
-  }
-}

library/src/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java

@@ -1,9 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-import java.io.IOException;
-
-public class PushNetworkException extends IOException {
-  public PushNetworkException(Exception exception) {
-    super(exception);
-  }
-}

library/src/org/whispersystems/textsecure/push/exceptions/RateLimitException.java

@@ -1,10 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-
-public class RateLimitException extends NonSuccessfulResponseCodeException {
-  public RateLimitException(String s) {
-    super(s);
-  }
-}

library/src/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java

@@ -1,17 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-import org.whispersystems.textsecure.push.StaleDevices;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-
-public class StaleDevicesException extends NonSuccessfulResponseCodeException {
-
-  private final StaleDevices staleDevices;
-
-  public StaleDevicesException(StaleDevices staleDevices) {
-    this.staleDevices = staleDevices;
-  }
-
-  public StaleDevices getStaleDevices() {
-    return staleDevices;
-  }
-}

library/src/org/whispersystems/textsecure/storage/CanonicalRecipient.java

@@ -1,6 +0,0 @@
-package org.whispersystems.textsecure.storage;
-
-public interface CanonicalRecipient {
-//  public String getNumber();
-  public long   getRecipientId();
-}

library/src/org/whispersystems/textsecure/storage/RecipientDevice.java

@@ -1,31 +0,0 @@
-package org.whispersystems.textsecure.storage;
-
-public class RecipientDevice {
-
-  public static final int DEFAULT_DEVICE_ID = 1;
-
-  private final long recipientId;
-  private final int  deviceId;
-
-  public RecipientDevice(long recipientId, int deviceId) {
-    this.recipientId = recipientId;
-    this.deviceId    = deviceId;
-  }
-
-  public long getRecipientId() {
-    return recipientId;
-  }
-
-  public int getDeviceId() {
-    return deviceId;
-  }
-
-  public CanonicalRecipient getRecipient() {
-    return new CanonicalRecipient() {
-      @Override
-      public long getRecipientId() {
-        return recipientId;
-      }
-    };
-  }
-}

library/src/org/whispersystems/textsecure/storage/SessionUtil.java

@@ -1,41 +0,0 @@
-package org.whispersystems.textsecure.storage;
-
-import android.content.Context;
-
-import org.whispersystems.libaxolotl.state.SessionStore;
-import org.whispersystems.textsecure.crypto.MasterSecret;
-
-public class SessionUtil {
-
-  public static int getSessionVersion(Context context,
-                                      MasterSecret masterSecret,
-                                      RecipientDevice recipient)
-  {
-    return
-        new TextSecureSessionStore(context, masterSecret)
-            .loadSession(recipient.getRecipientId(), recipient.getDeviceId())
-            .getSessionState()
-            .getSessionVersion();
-  }
-
-  public static boolean hasEncryptCapableSession(Context context,
-                                                 MasterSecret masterSecret,
-                                                 CanonicalRecipient recipient)
-  {
-    return hasEncryptCapableSession(context, masterSecret,
-                                    new RecipientDevice(recipient.getRecipientId(),
-                                                        RecipientDevice.DEFAULT_DEVICE_ID));
-  }
-
-  public static boolean hasEncryptCapableSession(Context context,
-                                                 MasterSecret masterSecret,
-                                                 RecipientDevice recipientDevice)
-  {
-    long         recipientId  = recipientDevice.getRecipientId();
-    int          deviceId     = recipientDevice.getDeviceId();
-    SessionStore sessionStore = new TextSecureSessionStore(context, masterSecret);
-
-    return sessionStore.containsSession(recipientId, deviceId);
-  }
-
-}

library/src/org/whispersystems/textsecure/util/FutureTaskListener.java

@@ -1,6 +0,0 @@
-package org.whispersystems.textsecure.util;
-
-public interface FutureTaskListener<V> {
-  public void onSuccess(V result);
-  public void onFailure(Throwable error);
-}

library/src/org/whispersystems/textsecure/util/InvalidNumberException.java

@@ -1,7 +0,0 @@
-package org.whispersystems.textsecure.util;
-
-public class InvalidNumberException extends Throwable {
-  public InvalidNumberException(String s) {
-    super(s);
-  }
-}

library/src/org/whispersystems/textsecure/util/ListenableFutureTask.java

@@ -1,52 +0,0 @@
-package org.whispersystems.textsecure.util;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
-
-public class ListenableFutureTask<V> extends FutureTask<V> {
-
-//  private WeakReference<FutureTaskListener<V>> listener;
-  private FutureTaskListener<V> listener;
-
-  public ListenableFutureTask(Callable<V> callable, FutureTaskListener<V> listener) {
-    super(callable);
-    this.listener = listener;
-//    if (listener == null) {
-//      this.listener = null;
-//    } else {
-//      this.listener = new WeakReference<FutureTaskListener<V>>(listener);
-//    }
-  }
-
-  public synchronized void setListener(FutureTaskListener<V> listener) {
-//    if (listener != null) this.listener = new WeakReference<FutureTaskListener<V>>(listener);
-//    else                  this.listener = null;
-    this.listener = listener;
-
-    if (this.isDone()) {
-      callback();
-    }
-  }
-
-  @Override
-  protected synchronized void done() {
-    callback();
-  }
-
-  private void callback() {
-    if (this.listener != null) {
-      FutureTaskListener<V> nestedListener = this.listener;
-//      FutureTaskListener<V> nestedListener = this.listener.get();
-      if (nestedListener != null) {
-        try {
-          nestedListener.onSuccess(get());
-        } catch (ExecutionException ee) {
-          nestedListener.onFailure(ee);
-        } catch (InterruptedException e) {
-          throw new AssertionError(e);
-        }
-      }
-    }
-  }
-}

library/src/org/whispersystems/textsecure/util/Util.java

@@ -1,214 +0,0 @@
-package org.whispersystems.textsecure.util;
-
-import android.content.Context;
-import android.graphics.Shader;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.DrawableContainer;
-import android.graphics.drawable.StateListDrawable;
-import android.telephony.TelephonyManager;
-import android.view.View;
-import android.widget.EditText;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.text.ParseException;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
-public class Util {
-
-  public static byte[] combine(byte[]... elements) {
-    try {
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-      for (byte[] element : elements) {
-        baos.write(element);
-      }
-
-      return baos.toByteArray();
-    } catch (IOException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  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)
-      throws ParseException
-  {
-    if (input == null || firstLength < 0 || secondLength < 0 || thirdLength < 0 ||
-        input.length < firstLength + secondLength + thirdLength)
-    {
-      throw new ParseException("Input too small: " + (input == null ? null : Hex.toString(input)), 0);
-    }
-
-    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 byte[] trim(byte[] input, int length) {
-    byte[] result = new byte[length];
-    System.arraycopy(input, 0, result, 0, result.length);
-
-    return result;
-  }
-
-  public static boolean isEmpty(String value) {
-    return value == null || value.trim().length() == 0;
-  }
-
-  public static boolean isEmpty(EditText value) {
-    return value == null || value.getText() == null || isEmpty(value.getText().toString());
-  }
-
-  public static boolean isEmpty(CharSequence value) {
-    return value == null || value.length() == 0;
-  }
-
-  public static String getSecret(int size) {
-    try {
-      byte[] secret = new byte[size];
-      SecureRandom.getInstance("SHA1PRNG").nextBytes(secret);
-      return Base64.encodeBytes(secret);
-    } catch (NoSuchAlgorithmException nsae) {
-      throw new AssertionError(nsae);
-    }
-  }
-
-  public static String readFully(File file) throws IOException {
-    return readFully(new FileInputStream(file));
-  }
-
-  public static String readFully(InputStream in) throws IOException {
-    ByteArrayOutputStream bout = new ByteArrayOutputStream();
-    byte[] buffer              = new byte[4096];
-    int read;
-
-    while ((read = in.read(buffer)) != -1) {
-      bout.write(buffer, 0, read);
-    }
-
-    in.close();
-
-    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;
-
-    while ((read = in.read(buffer)) != -1) {
-      out.write(buffer, 0, read);
-    }
-
-    in.close();
-    out.close();
-  }
-
-  public static String join(Collection<String> list, String delimiter) {
-    StringBuilder result = new StringBuilder();
-    int i=0;
-
-    for (String item : list) {
-      result.append(item);
-
-      if (++i < list.size())
-        result.append(delimiter);
-    }
-
-    return result.toString();
-  }
-
-  public static List<String> split(String source, String delimiter) {
-    List<String> results = new LinkedList<String>();
-
-    if (isEmpty(source)) {
-      return results;
-    }
-
-    String[] elements = source.split(delimiter);
-
-    for (String element : elements) {
-      results.add(element);
-    }
-
-    return results;
-  }
-
-  public static String getDeviceE164Number(Context context) {
-    String localNumber = ((TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE))
-        .getLine1Number();
-
-    if (!org.whispersystems.textsecure.util.Util.isEmpty(localNumber) &&
-        !localNumber.startsWith("+"))
-    {
-      if (localNumber.length() == 10) localNumber = "+1" + localNumber;
-      else                            localNumber = "+"  + localNumber;
-
-      return localNumber;
-    }
-
-    return null;
-  }
-
-  public static SecureRandom getSecureRandom() {
-    try {
-      return SecureRandom.getInstance("SHA1PRNG");
-    } catch (NoSuchAlgorithmException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  /*
-   * source: http://stackoverflow.com/a/9500334
-   */
-  public static void fixBackgroundRepeat(Drawable bg) {
-    if (bg != null) {
-      if (bg instanceof BitmapDrawable) {
-        BitmapDrawable bmp = (BitmapDrawable) bg;
-        bmp.mutate();
-        bmp.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
-      }
-    }
-  }
-}

library/src/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java

@@ -1,285 +0,0 @@
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.whispersystems.textsecure.zxing.integration;
-
-import android.app.AlertDialog;
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-
-/**
- * <p>A utility class which helps ease integration with Barcode Scanner via {@link Intent}s. This is a simple
- * way to invoke barcode scanning and receive the result, without any need to integrate, modify, or learn the
- * project's source code.</p>
- *
- * <h2>Initiating a barcode scan</h2>
- *
- * <p>Integration is essentially as easy as calling {@link #initiateScan(Activity)} and waiting
- * for the result in your app.</p>
- *
- * <p>It does require that the Barcode Scanner application is installed. The
- * {@link #initiateScan(Activity)} method will prompt the user to download the application, if needed.</p>
- *
- * <p>There are a few steps to using this integration. First, your {@link Activity} must implement
- * the method {@link Activity#onActivityResult(int, int, Intent)} and include a line of code like this:</p>
- *
- * <p>{@code
- * public void onActivityResult(int requestCode, int resultCode, Intent intent) {
- *   IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
- *   if (scanResult != null) {
- *     // handle scan result
- *   }
- *   // else continue with any other code you need in the method
- *   ...
- * }
- * }</p>
- *
- * <p>This is where you will handle a scan result.
- * Second, just call this in response to a user action somewhere to begin the scan process:</p>
- *
- * <p>{@code IntentIntegrator.initiateScan(yourActivity);}</p>
- *
- * <p>You can use {@link #initiateScan(Activity, CharSequence, CharSequence, CharSequence, CharSequence)} or
- * {@link #initiateScan(Activity, int, int, int, int)} to customize the download prompt with
- * different text labels.</p>
- *
- * <p>Note that {@link #initiateScan(Activity)} returns an {@link AlertDialog} which is non-null if the
- * user was prompted to download the application. This lets the calling app potentially manage the dialog.
- * In particular, ideally, the app dismisses the dialog if it's still active in its {@link Activity#onPause()}
- * method.</p>
- *
- * <h2>Sharing text via barcode</h2>
- *
- * <p>To share text, encoded as a QR Code on-screen, similarly, see {@link #shareText(Activity, CharSequence)}.</p>
- *
- * <p>Some code, particularly download integration, was contributed from the Anobiit application.</p>
- *
- * @author Sean Owen
- * @author Fred Lin
- * @author Isaac Potoczny-Jones
- * @author Brad Drehmer
- */
-public final class IntentIntegrator {
-
-  public static final int REQUEST_CODE = 0x0ba7c0de; // get it?
-
-  public static final String DEFAULT_TITLE = "Install Barcode Scanner?";
-  public static final String DEFAULT_MESSAGE =
-      "This application requires Barcode Scanner. Would you like to install it?";
-  public static final String DEFAULT_YES = "Yes";
-  public static final String DEFAULT_NO = "No";
-
-  // supported barcode formats
-  public static final String PRODUCT_CODE_TYPES = "UPC_A,UPC_E,EAN_8,EAN_13";
-  public static final String ONE_D_CODE_TYPES = PRODUCT_CODE_TYPES + ",CODE_39,CODE_93,CODE_128";
-  public static final String QR_CODE_TYPES = "QR_CODE";
-  public static final String ALL_CODE_TYPES = null;
-
-  private IntentIntegrator() {
-  }
-
-  /**
-   * See {@link #initiateScan(Activity, CharSequence, CharSequence, CharSequence, CharSequence)} --
-   * same, but uses default English labels.
-   */
-  public static AlertDialog initiateScan(Activity activity) {
-    return initiateScan(activity, DEFAULT_TITLE, DEFAULT_MESSAGE, DEFAULT_YES, DEFAULT_NO);
-  }
-
-  /**
-   * See {@link #initiateScan(Activity, CharSequence, CharSequence, CharSequence, CharSequence)} --
-   * same, but takes string IDs which refer
-   * to the {@link Activity}'s resource bundle entries.
-   */
-  public static AlertDialog initiateScan(Activity activity,
-                                         int stringTitle,
-                                         int stringMessage,
-                                         int stringButtonYes,
-                                         int stringButtonNo) {
-    return initiateScan(activity,
-                        activity.getString(stringTitle),
-                        activity.getString(stringMessage),
-                        activity.getString(stringButtonYes),
-                        activity.getString(stringButtonNo));
-  }
-
-  /**
-   * See {@link #initiateScan(Activity, CharSequence, CharSequence, CharSequence, CharSequence, CharSequence)} --
-   * same, but scans for all supported barcode types.
-   * @param stringTitle title of dialog prompting user to download Barcode Scanner
-   * @param stringMessage text of dialog prompting user to download Barcode Scanner
-   * @param stringButtonYes text of button user clicks when agreeing to download
-   *  Barcode Scanner (e.g. "Yes")
-   * @param stringButtonNo text of button user clicks when declining to download
-   *  Barcode Scanner (e.g. "No")
-   * @return an {@link AlertDialog} if the user was prompted to download the app,
-   *  null otherwise
-   */
-  public static AlertDialog initiateScan(Activity activity,
-                                         CharSequence stringTitle,
-                                         CharSequence stringMessage,
-                                         CharSequence stringButtonYes,
-                                         CharSequence stringButtonNo) {
-
-    return initiateScan(activity,
-                        stringTitle,
-                        stringMessage,
-                        stringButtonYes,
-                        stringButtonNo,
-                        ALL_CODE_TYPES);
-  }
-
-  /**
-   * Invokes scanning.
-   *
-   * @param stringTitle title of dialog prompting user to download Barcode Scanner
-   * @param stringMessage text of dialog prompting user to download Barcode Scanner
-   * @param stringButtonYes text of button user clicks when agreeing to download
-   *  Barcode Scanner (e.g. "Yes")
-   * @param stringButtonNo text of button user clicks when declining to download
-   *  Barcode Scanner (e.g. "No")
-   * @param stringDesiredBarcodeFormats a comma separated list of codes you would
-   *  like to scan for.
-   * @return an {@link AlertDialog} if the user was prompted to download the app,
-   *  null otherwise
-   * @throws InterruptedException if timeout expires before a scan completes
-   */
-  public static AlertDialog initiateScan(Activity activity,
-                                         CharSequence stringTitle,
-                                         CharSequence stringMessage,
-                                         CharSequence stringButtonYes,
-                                         CharSequence stringButtonNo,
-                                         CharSequence stringDesiredBarcodeFormats) {
-    Intent intentScan = new Intent("com.google.zxing.client.android.SCAN");
-    intentScan.addCategory(Intent.CATEGORY_DEFAULT);
-
-    // check which types of codes to scan for
-    if (stringDesiredBarcodeFormats != null) {
-      // set the desired barcode types
-      intentScan.putExtra("SCAN_FORMATS", stringDesiredBarcodeFormats);
-    }
-
-    try {
-      activity.startActivityForResult(intentScan, REQUEST_CODE);
-      return null;
-    } catch (ActivityNotFoundException e) {
-      return showDownloadDialog(activity, stringTitle, stringMessage, stringButtonYes, stringButtonNo);
-    }
-  }
-
-  private static AlertDialog showDownloadDialog(final Activity activity,
-                                                CharSequence stringTitle,
-                                                CharSequence stringMessage,
-                                                CharSequence stringButtonYes,
-                                                CharSequence stringButtonNo) {
-    AlertDialog.Builder downloadDialog = new AlertDialog.Builder(activity);
-    downloadDialog.setTitle(stringTitle);
-    downloadDialog.setMessage(stringMessage);
-    downloadDialog.setPositiveButton(stringButtonYes, new DialogInterface.OnClickListener() {
-      public void onClick(DialogInterface dialogInterface, int i) {
-        Uri uri = Uri.parse("market://search?q=pname:com.google.zxing.client.android");
-        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-        activity.startActivity(intent);
-      }
-    });
-    downloadDialog.setNegativeButton(stringButtonNo, new DialogInterface.OnClickListener() {
-      public void onClick(DialogInterface dialogInterface, int i) {}
-    });
-    return downloadDialog.show();
-  }
-
-
-  /**
-   * <p>Call this from your {@link Activity}'s
-   * {@link Activity#onActivityResult(int, int, Intent)} method.</p>
-   *
-   * @return null if the event handled here was not related to {@link IntentIntegrator}, or
-   *  else an {@link IntentResult} containing the result of the scan. If the user cancelled scanning,
-   *  the fields will be null.
-   */
-  public static IntentResult parseActivityResult(int requestCode, int resultCode, Intent intent) {
-    if (requestCode == REQUEST_CODE) {
-      if (resultCode == Activity.RESULT_OK) {
-        String contents = intent.getStringExtra("SCAN_RESULT");
-        String formatName = intent.getStringExtra("SCAN_RESULT_FORMAT");
-        return new IntentResult(contents, formatName);
-      } else {
-        return new IntentResult(null, null);
-      }
-    }
-    return null;
-  }
-
-  /**
-   * See {@link #shareText(Activity, CharSequence, CharSequence, CharSequence, CharSequence, CharSequence)} --
-   * same, but uses default English labels.
-   */
-  public static void shareText(Activity activity, CharSequence text) {
-    shareText(activity, text, DEFAULT_TITLE, DEFAULT_MESSAGE, DEFAULT_YES, DEFAULT_NO);
-  }
-
-  /**
-   * See {@link #shareText(Activity, CharSequence, CharSequence, CharSequence, CharSequence, CharSequence)} --
-   * same, but takes string IDs which refer to the {@link Activity}'s resource bundle entries.
-   */
-  public static void shareText(Activity activity,
-                               CharSequence text,
-                               int stringTitle,
-                               int stringMessage,
-                               int stringButtonYes,
-                               int stringButtonNo) {
-    shareText(activity,
-              text,
-              activity.getString(stringTitle),
-              activity.getString(stringMessage),
-              activity.getString(stringButtonYes),
-              activity.getString(stringButtonNo));
-  }
-
-  /**
-   * Shares the given text by encoding it as a barcode, such that another user can
-   * scan the text off the screen of the device.
-   *
-   * @param text the text string to encode as a barcode
-   * @param stringTitle title of dialog prompting user to download Barcode Scanner
-   * @param stringMessage text of dialog prompting user to download Barcode Scanner
-   * @param stringButtonYes text of button user clicks when agreeing to download
-   *  Barcode Scanner (e.g. "Yes")
-   * @param stringButtonNo text of button user clicks when declining to download
-   *  Barcode Scanner (e.g. "No")
-   */
-  public static void shareText(Activity activity,
-                               CharSequence text,
-                               CharSequence stringTitle,
-                               CharSequence stringMessage,
-                               CharSequence stringButtonYes,
-                               CharSequence stringButtonNo) {
-
-    Intent intent = new Intent();
-    intent.setAction("com.google.zxing.client.android.ENCODE");
-    intent.putExtra("ENCODE_TYPE", "TEXT_TYPE");
-    intent.putExtra("ENCODE_DATA", text);
-    try {
-      activity.startActivity(intent);
-    } catch (ActivityNotFoundException e) {
-      showDownloadDialog(activity, stringTitle, stringMessage, stringButtonYes, stringButtonNo);
-    }
-  }
-
-}

library/src/org/whispersystems/textsecure/zxing/integration/IntentResult.java

@@ -1,48 +0,0 @@
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.whispersystems.textsecure.zxing.integration;
-
-/**
- * <p>Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.</p>
- *
- * @author Sean Owen
- */
-public final class IntentResult {
-
-  private final String contents;
-  private final String formatName;
-
-  IntentResult(String contents, String formatName) {
-    this.contents = contents;
-    this.formatName = formatName;
-  }
-
-  /**
-   * @return raw content of barcode
-   */
-  public String getContents() {
-    return contents;
-  }
-
-  /**
-   * @return name of format, like "QR_CODE", "UPC_A". See <code>BarcodeFormat</code> for more format names.
-   */
-  public String getFormatName() {
-    return formatName;
-  }
-
-}

libtextsecure/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.2'
+        classpath 'com.android.tools.build:gradle:0.14.2'
     }
 }
 
@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     compile 'com.google.protobuf:protobuf-java:2.5.0'
-    compile 'com.madgag:sc-light-jdk15on:1.47.0.2'
+//    compile 'com.madgag:sc-light-jdk15on:1.47.0.2'
     compile 'com.googlecode.libphonenumber:libphonenumber:6.1'
     compile 'org.whispersystems:gson:2.2.4'
 
@@ -28,34 +28,13 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 21
+    buildToolsVersion '21.1.1'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
-
-    android {
-        sourceSets {
-            main {
-                manifest.srcFile 'AndroidManifest.xml'
-                java.srcDirs = ['src']
-                resources.srcDirs = ['src']
-                aidl.srcDirs = ['src']
-                renderscript.srcDirs = ['src']
-                res.srcDirs = ['res']
-                assets.srcDirs = ['assets']
-                jniLibs.srcDirs = ['libs']
-            }
-            androidTest {
-                java.srcDirs = ['androidTest/java']
-                resources.srcDirs = ['androidTest/java']
-                aidl.srcDirs = ['androidTest/java']
-                renderscript.srcDirs = ['androidTest/java']
-            }
-        }
-    }
 }
 
 tasks.whenTaskAdded { task ->
@@ -66,7 +45,7 @@ tasks.whenTaskAdded { task ->
 
 version '0.1'
 group 'org.whispersystems.textsecure'
-archivesBaseName = 'textsecure-library'
+archivesBaseName = 'libtextsecure'
 
 uploadArchives {
     repositories {

libtextsecure/protobuf/IncomingPushMessageSignal.proto

@@ -1,6 +1,6 @@
 package textsecure;
 
-option java_package = "org.whispersystems.textsecure.push";
+option java_package = "org.whispersystems.textsecure.internal.push";
 option java_outer_classname = "PushMessageProtos";
 
 message IncomingPushMessageSignal {

libtextsecure/protobuf/Makefile

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

libtextsecure/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java

@@ -1,11 +1,8 @@
 package org.whispersystems.textsecure.push;
 
 import android.test.AndroidTestCase;
-import android.util.Base64;
 
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Arrays;
+import org.whispersystems.textsecure.internal.push.PushTransportDetails;
 
 public class PushTransportDetailsTest extends AndroidTestCase {
 
@@ -35,23 +32,4 @@ public class PushTransportDetailsTest extends AndroidTestCase {
       assertTrue(transportV2.getPaddedMessageBody(message).length == message.length);
     }
   }
-
-  public void testV3Encoding() throws NoSuchAlgorithmException {
-    byte[] message = new byte[501];
-    SecureRandom.getInstance("SHA1PRNG").nextBytes(message);
-
-    byte[] padded = transportV3.getEncodedMessage(message);
-
-    assertTrue(Arrays.equals(padded, message));
-  }
-
-  public void testV2Encoding() throws NoSuchAlgorithmException {
-    byte[] message = new byte[501];
-    SecureRandom.getInstance("SHA1PRNG").nextBytes(message);
-
-    byte[] padded = transportV2.getEncodedMessage(message);
-
-    assertTrue(Arrays.equals(padded, message));
-  }
-
 }

libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java

@@ -0,0 +1,97 @@
+/**
+ * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+ */
+package org.whispersystems.textsecure.api;
+
+import org.whispersystems.libaxolotl.IdentityKey;
+import org.whispersystems.libaxolotl.state.PreKeyRecord;
+import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
+import org.whispersystems.libaxolotl.util.guava.Optional;
+import org.whispersystems.textsecure.api.push.ContactTokenDetails;
+import org.whispersystems.textsecure.api.push.TrustStore;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
+import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+public class TextSecureAccountManager {
+
+  private final PushServiceSocket pushServiceSocket;
+
+  public TextSecureAccountManager(String url, TrustStore trustStore,
+                                  String user, String password)
+  {
+    this.pushServiceSocket = new PushServiceSocket(url, trustStore, user, password);
+  }
+
+  public void setGcmId(Optional<String> gcmRegistrationId) throws IOException {
+    if (gcmRegistrationId.isPresent()) {
+      this.pushServiceSocket.registerGcmId(gcmRegistrationId.get());
+    } else {
+      this.pushServiceSocket.unregisterGcmId();
+    }
+  }
+
+  public void requestSmsVerificationCode() throws IOException {
+    this.pushServiceSocket.createAccount(false);
+  }
+
+  public void requestVoiceVerificationCode() throws IOException {
+    this.pushServiceSocket.createAccount(true);
+  }
+
+  public void verifyAccount(String verificationCode, String signalingKey,
+                            boolean supportsSms, int axolotlRegistrationId)
+      throws IOException
+  {
+    this.pushServiceSocket.verifyAccount(verificationCode, signalingKey,
+                                         supportsSms, axolotlRegistrationId);
+  }
+
+  public void setPreKeys(IdentityKey identityKey, PreKeyRecord lastResortKey,
+                         SignedPreKeyRecord signedPreKey, List<PreKeyRecord> oneTimePreKeys)
+      throws IOException
+  {
+    this.pushServiceSocket.registerPreKeys(identityKey, lastResortKey, signedPreKey, oneTimePreKeys);
+  }
+
+  public int getPreKeysCount() throws IOException {
+    return this.pushServiceSocket.getAvailablePreKeys();
+  }
+
+  public void setSignedPreKey(SignedPreKeyRecord signedPreKey) throws IOException {
+    this.pushServiceSocket.setCurrentSignedPreKey(signedPreKey);
+  }
+
+  public SignedPreKeyEntity getSignedPreKey() throws IOException {
+    return this.pushServiceSocket.getCurrentSignedPreKey();
+  }
+
+  public Optional<ContactTokenDetails> getContact(String contactToken) throws IOException {
+    return Optional.fromNullable(this.pushServiceSocket.getContactTokenDetails(contactToken));
+  }
+
+  public List<ContactTokenDetails> getContacts(Set<String> contactTokens)
+      throws IOException
+  {
+    return this.pushServiceSocket.retrieveDirectory(contactTokens);
+  }
+
+}

libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java

@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+ */
+package org.whispersystems.textsecure.api;
+
+import org.whispersystems.libaxolotl.InvalidMessageException;
+import org.whispersystems.textsecure.api.crypto.AttachmentCipherInputStream;
+import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer;
+import org.whispersystems.textsecure.api.push.TrustStore;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class TextSecureMessageReceiver {
+
+  private final PushServiceSocket socket;
+
+  public TextSecureMessageReceiver(String url, TrustStore trustStore,
+                                   String user, String password)
+  {
+    this.socket = new PushServiceSocket(url, trustStore, user, password);
+  }
+
+  public InputStream retrieveAttachment(TextSecureAttachmentPointer pointer, File destination)
+      throws IOException, InvalidMessageException
+  {
+    socket.retrieveAttachment(pointer.getRelay().orNull(), pointer.getId(), destination);
+    return new AttachmentCipherInputStream(destination, pointer.getKey());
+  }
+
+}

libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java

@@ -0,0 +1,323 @@
+/**
+ * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+ */
+package org.whispersystems.textsecure.api;
+
+import android.util.Log;
+
+import com.google.protobuf.ByteString;
+
+import org.whispersystems.libaxolotl.InvalidKeyException;
+import org.whispersystems.libaxolotl.SessionBuilder;
+import org.whispersystems.libaxolotl.protocol.CiphertextMessage;
+import org.whispersystems.libaxolotl.state.AxolotlStore;
+import org.whispersystems.libaxolotl.state.PreKeyBundle;
+import org.whispersystems.libaxolotl.util.guava.Optional;
+import org.whispersystems.textsecure.api.crypto.TextSecureCipher;
+import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
+import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
+import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream;
+import org.whispersystems.textsecure.api.messages.TextSecureGroup;
+import org.whispersystems.textsecure.api.messages.TextSecureMessage;
+import org.whispersystems.textsecure.api.push.PushAddress;
+import org.whispersystems.textsecure.api.push.TrustStore;
+import org.whispersystems.textsecure.internal.push.MismatchedDevices;
+import org.whispersystems.textsecure.internal.push.OutgoingPushMessage;
+import org.whispersystems.textsecure.internal.push.OutgoingPushMessageList;
+import org.whispersystems.textsecure.internal.push.PushAttachmentData;
+import org.whispersystems.textsecure.internal.push.PushBody;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
+import org.whispersystems.textsecure.internal.push.StaleDevices;
+import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
+import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.textsecure.internal.push.exceptions.MismatchedDevicesException;
+import org.whispersystems.textsecure.internal.push.exceptions.StaleDevicesException;
+import org.whispersystems.textsecure.internal.util.Util;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
+
+public class TextSecureMessageSender {
+
+  private static final String TAG = TextSecureMessageSender.class.getSimpleName();
+
+  private final PushServiceSocket       socket;
+  private final AxolotlStore            store;
+  private final Optional<EventListener> eventListener;
+
+  public TextSecureMessageSender(String url, TrustStore trustStore,
+                                 String user, String password, AxolotlStore store,
+                                 Optional<EventListener> eventListener)
+  {
+    this.socket        = new PushServiceSocket(url, trustStore, user, password);
+    this.store         = store;
+    this.eventListener = eventListener;
+  }
+
+  public void sendDeliveryReceipt(PushAddress recipient, long messageId) throws IOException {
+    this.socket.sendReceipt(recipient.getNumber(), messageId, recipient.getRelay());
+  }
+
+  public void sendMessage(PushAddress recipient, TextSecureMessage message)
+      throws UntrustedIdentityException, IOException
+  {
+    byte[] content = createMessageContent(message);
+    sendMessage(recipient, message.getTimestamp(), content);
+
+    if (message.isEndSession()) {
+      store.deleteAllSessions(recipient.getRecipientId());
+
+      if (eventListener.isPresent()) {
+        eventListener.get().onSecurityEvent(recipient.getRecipientId());
+      }
+    }
+  }
+
+  public void sendMessage(List<PushAddress> recipients, TextSecureMessage message)
+      throws IOException, EncapsulatedExceptions
+  {
+    byte[] content = createMessageContent(message);
+    sendMessage(recipients, message.getTimestamp(), content);
+  }
+
+  private byte[] createMessageContent(TextSecureMessage message) throws IOException {
+    PushMessageContent.Builder builder  = PushMessageContent.newBuilder();
+    List<AttachmentPointer>    pointers = createAttachmentPointers(message.getAttachments());
+
+    if (!pointers.isEmpty()) {
+      builder.addAllAttachments(pointers);
+    }
+
+    if (message.getBody().isPresent()) {
+      builder.setBody(message.getBody().get());
+    }
+
+    if (message.getGroupInfo().isPresent()) {
+      builder.setGroup(createGroupContent(message.getGroupInfo().get()));
+    }
+
+    if (message.isEndSession()) {
+      builder.setFlags(PushMessageContent.Flags.END_SESSION_VALUE);
+    }
+
+    return builder.build().toByteArray();
+  }
+
+  private GroupContext createGroupContent(TextSecureGroup group) throws IOException {
+    GroupContext.Builder builder = GroupContext.newBuilder();
+    builder.setId(ByteString.copyFrom(group.getGroupId()));
+
+    if (group.getType() != TextSecureGroup.Type.DELIVER) {
+      if      (group.getType() == TextSecureGroup.Type.UPDATE) builder.setType(GroupContext.Type.UPDATE);
+      else if (group.getType() == TextSecureGroup.Type.QUIT)   builder.setType(GroupContext.Type.QUIT);
+      else                                                     throw new AssertionError("Unknown type: " + group.getType());
+
+      if (group.getName().isPresent()) builder.setName(group.getName().get());
+      if (group.getMembers().isPresent()) builder.addAllMembers(group.getMembers().get());
+
+      if (group.getAvatar().isPresent() && group.getAvatar().get().isStream()) {
+        AttachmentPointer pointer = createAttachmentPointer(group.getAvatar().get().asStream());
+        builder.setAvatar(pointer);
+      }
+    } else {
+      builder.setType(GroupContext.Type.DELIVER);
+    }
+
+    return builder.build();
+  }
+
+  private void sendMessage(List<PushAddress> recipients, long timestamp, byte[] content)
+      throws IOException, EncapsulatedExceptions
+  {
+    List<UntrustedIdentityException> untrustedIdentities = new LinkedList<>();
+    List<UnregisteredUserException>  unregisteredUsers   = new LinkedList<>();
+
+    for (PushAddress recipient : recipients) {
+      try {
+        sendMessage(recipient, timestamp, content);
+      } catch (UntrustedIdentityException e) {
+        Log.w(TAG, e);
+        untrustedIdentities.add(e);
+      } catch (UnregisteredUserException e) {
+        Log.w(TAG, e);
+        unregisteredUsers.add(e);
+      }
+    }
+
+    if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty()) {
+      throw new EncapsulatedExceptions(untrustedIdentities, unregisteredUsers);
+    }
+  }
+
+  private void sendMessage(PushAddress recipient, long timestamp, byte[] content)
+      throws UntrustedIdentityException, IOException
+  {
+    for (int i=0;i<3;i++) {
+      try {
+        OutgoingPushMessageList messages = getEncryptedMessages(socket, recipient, timestamp, content);
+        socket.sendMessage(messages);
+
+        return;
+      } catch (MismatchedDevicesException mde) {
+        Log.w(TAG, mde);
+        handleMismatchedDevices(socket, recipient, mde.getMismatchedDevices());
+      } catch (StaleDevicesException ste) {
+        Log.w(TAG, ste);
+        handleStaleDevices(recipient, ste.getStaleDevices());
+      }
+    }
+  }
+
+  private List<AttachmentPointer> createAttachmentPointers(Optional<List<TextSecureAttachment>> attachments) throws IOException {
+    List<AttachmentPointer> pointers = new LinkedList<>();
+
+    if (!attachments.isPresent() || attachments.get().isEmpty()) {
+      Log.w(TAG, "No attachments present...");
+      return pointers;
+    }
+
+    for (TextSecureAttachment attachment : attachments.get()) {
+      if (attachment.isStream()) {
+        Log.w(TAG, "Found attachment, creating pointer...");
+        pointers.add(createAttachmentPointer(attachment.asStream()));
+      }
+    }
+
+    return pointers;
+  }
+
+  private AttachmentPointer createAttachmentPointer(TextSecureAttachmentStream attachment)
+      throws IOException
+  {
+    byte[]             attachmentKey  = Util.getSecretBytes(64);
+    PushAttachmentData attachmentData = new PushAttachmentData(attachment.getContentType(),
+                                                               attachment.getInputStream(),
+                                                               attachment.getLength(),
+                                                               attachmentKey);
+
+    long attachmentId = socket.sendAttachment(attachmentData);
+
+    return AttachmentPointer.newBuilder()
+                            .setContentType(attachment.getContentType())
+                            .setId(attachmentId)
+                            .setKey(ByteString.copyFrom(attachmentKey))
+                            .build();
+  }
+
+
+  private OutgoingPushMessageList getEncryptedMessages(PushServiceSocket socket,
+                                                       PushAddress recipient,
+                                                       long timestamp,
+                                                       byte[] plaintext)
+      throws IOException, UntrustedIdentityException
+  {
+    PushBody masterBody = getEncryptedMessage(socket, recipient, plaintext);
+
+    List<OutgoingPushMessage> messages = new LinkedList<>();
+    messages.add(new OutgoingPushMessage(recipient, masterBody));
+
+    for (int deviceId : store.getSubDeviceSessions(recipient.getRecipientId())) {
+      PushAddress device = new PushAddress(recipient.getRecipientId(), recipient.getNumber(), deviceId, recipient.getRelay());
+      PushBody    body   = getEncryptedMessage(socket, device, plaintext);
+
+      messages.add(new OutgoingPushMessage(device, body));
+    }
+
+    return new OutgoingPushMessageList(recipient.getNumber(), timestamp, recipient.getRelay(), messages);
+  }
+
+  private PushBody getEncryptedMessage(PushServiceSocket socket, PushAddress recipient, byte[] plaintext)
+      throws IOException, UntrustedIdentityException
+  {
+    if (!store.containsSession(recipient.getRecipientId(), recipient.getDeviceId())) {
+      try {
+        List<PreKeyBundle> preKeys = socket.getPreKeys(recipient);
+
+        for (PreKeyBundle preKey : preKeys) {
+          try {
+            SessionBuilder sessionBuilder = new SessionBuilder(store, recipient.getRecipientId(), recipient.getDeviceId());
+            sessionBuilder.process(preKey);
+          } catch (org.whispersystems.libaxolotl.UntrustedIdentityException e) {
+            throw new UntrustedIdentityException("Untrusted identity key!", recipient.getNumber(), preKey.getIdentityKey());
+          }
+        }
+
+        if (eventListener.isPresent()) {
+          eventListener.get().onSecurityEvent(recipient.getRecipientId());
+        }
+      } catch (InvalidKeyException e) {
+        throw new IOException(e);
+      }
+    }
+
+    TextSecureCipher  cipher               = new TextSecureCipher(store, recipient.getRecipientId(), recipient.getDeviceId());
+    CiphertextMessage message              = cipher.encrypt(plaintext);
+    int               remoteRegistrationId = cipher.getRemoteRegistrationId();
+
+    if (message.getType() == CiphertextMessage.PREKEY_TYPE) {
+      return new PushBody(Type.PREKEY_BUNDLE_VALUE, remoteRegistrationId, message.serialize());
+    } else if (message.getType() == CiphertextMessage.WHISPER_TYPE) {
+      return new PushBody(Type.CIPHERTEXT_VALUE, remoteRegistrationId, message.serialize());
+    } else {
+      throw new AssertionError("Unknown ciphertext type: " + message.getType());
+    }
+  }
+
+  private void handleMismatchedDevices(PushServiceSocket socket, PushAddress recipient,
+                                       MismatchedDevices mismatchedDevices)
+      throws IOException, UntrustedIdentityException
+  {
+    try {
+      for (int extraDeviceId : mismatchedDevices.getExtraDevices()) {
+        store.deleteSession(recipient.getRecipientId(), extraDeviceId);
+      }
+
+      for (int missingDeviceId : mismatchedDevices.getMissingDevices()) {
+        PushAddress  device = new PushAddress(recipient.getRecipientId(), recipient.getNumber(),
+                                              missingDeviceId, recipient.getRelay());
+        PreKeyBundle preKey = socket.getPreKey(device);
+
+        try {
+          SessionBuilder sessionBuilder = new SessionBuilder(store, device.getRecipientId(), device.getDeviceId());
+          sessionBuilder.process(preKey);
+        } catch (org.whispersystems.libaxolotl.UntrustedIdentityException e) {
+          throw new UntrustedIdentityException("Untrusted identity key!", recipient.getNumber(), preKey.getIdentityKey());
+        }
+      }
+    } catch (InvalidKeyException e) {
+      throw new IOException(e);
+    }
+  }
+
+  private void handleStaleDevices(PushAddress recipient, StaleDevices staleDevices) {
+    long recipientId = recipient.getRecipientId();
+
+    for (int staleDeviceId : staleDevices.getStaleDevices()) {
+      store.deleteSession(recipientId, staleDeviceId);
+    }
+  }
+
+  public static interface EventListener {
+    public void onSecurityEvent(long recipientId);
+  }
+
+}

libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Open Whisper Systems
+ * Copyright (C) 2013-2014 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
@@ -14,13 +14,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.whispersystems.textsecure.crypto;
-
-import android.util.Log;
+package org.whispersystems.textsecure.api.crypto;
 
 import org.whispersystems.libaxolotl.InvalidMacException;
 import org.whispersystems.libaxolotl.InvalidMessageException;
-import org.whispersystems.textsecure.util.Util;
+import org.whispersystems.textsecure.internal.util.Util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -48,13 +46,15 @@ import javax.crypto.spec.SecretKeySpec;
 
 public class AttachmentCipherInputStream extends FileInputStream {
 
-  private static final int BLOCK_SIZE = 16;
+  private static final int BLOCK_SIZE      = 16;
+  private static final int CIPHER_KEY_SIZE = 32;
+  private static final int MAC_KEY_SIZE    = 32;
 
   private Cipher  cipher;
   private boolean done;
   private long    totalDataSize;
   private long    totalRead;
-  private byte[] overflowBuffer;
+  private byte[]  overflowBuffer;
 
   public AttachmentCipherInputStream(File file, byte[] combinedKeyMaterial)
       throws IOException, InvalidMessageException
@@ -62,11 +62,9 @@ public class AttachmentCipherInputStream extends FileInputStream {
     super(file);
 
     try {
-      byte[][] parts = Util.split(combinedKeyMaterial,
-                                  AttachmentCipher.CIPHER_KEY_SIZE,
-                                  AttachmentCipher.MAC_KEY_SIZE);
+      byte[][] parts = Util.split(combinedKeyMaterial, CIPHER_KEY_SIZE, MAC_KEY_SIZE);
+      Mac      mac   = Mac.getInstance("HmacSHA256");
 
-      Mac mac = Mac.getInstance("HmacSHA256");
       mac.init(new SecretKeySpec(parts[1], "HmacSHA256"));
 
       if (file.length() <= BLOCK_SIZE + mac.getMacLength()) {
@@ -84,16 +82,10 @@ public class AttachmentCipherInputStream extends FileInputStream {
       this.done          = false;
       this.totalRead     = 0;
       this.totalDataSize = file.length() - cipher.getBlockSize() - mac.getMacLength();
-    } catch (NoSuchAlgorithmException e) {
-      throw new AssertionError(e);
-    } catch (InvalidKeyException e) {
+    } catch (NoSuchAlgorithmException | InvalidKeyException | NoSuchPaddingException | InvalidAlgorithmParameterException 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);
     }
   }
 
@@ -115,15 +107,8 @@ public class AttachmentCipherInputStream extends FileInputStream {
 
       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!");
+    } catch (IllegalBlockSizeException | BadPaddingException | ShortBufferException e) {
+      throw new IOException(e);
     }
   }