Bump version to 2.2.0

// FREEBIE

AndroidManifest.xml

@@ -2,10 +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="72"
-      android:versionName="2.1.0">
-
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/>
+      android:versionCode="83"
+      android:versionName="2.2.0">
 
     <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
@@ -33,18 +31,20 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_CALL_LOG" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
     <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
                 android:protectionLevel="signature" />
     <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
 
-    <application android:name="org.thoughtcrime.securesms.ApplicationListener"
+    <application android:name=".ApplicationContext"
                  android:icon="@drawable/icon"
                  android:label="@string/app_name"
                  android:theme="@style/TextSecure.LightTheme">
 
+        <meta-data android:name="com.google.android.gms.version"
+                   android:value="@integer/google_play_services_version" />
+
         <activity android:name=".RoutingActivity"
                   android:theme="@style/NoAnimation.Theme.BlackScreen"
                   android:launchMode="singleTask"
@@ -126,7 +126,7 @@
     <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"
+              android:theme="@style/TextSecure.IntroTheme"
               android:launchMode="singleTop"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -203,13 +203,13 @@
               android:clearTaskOnLaunch="true"
               android:finishOnTaskLaunch="true" />
 
+    <service android:enabled="true" android:name=".service.GcmRegistrationService"/>
     <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:enabled="true" android:name=".gcm.GcmIntentService"/>
 
     <service android:name=".service.QuickResponseService"
              android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
@@ -236,7 +236,6 @@
     <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
         <intent-filter>
             <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
             <category android:name="org.thoughtcrime.securesms" />
         </intent-filter>
     </receiver>
@@ -302,8 +301,4 @@
 
        <uses-library android:name="android.test.runner" />
 </application>
-
-<instrumentation android:name="android.test.InstrumentationTestRunner"
-       android:targetPackage="org.thoughtcrime.securesms.tests" android:label="Tests for My App" />
-
 </manifest>

BUILDING.md

@@ -45,12 +45,12 @@ Setting up a development environment
 
 [Android Studio](https://developer.android.com/sdk/installing/studio.html) is the recommended development environment.
 
-1. Install Android Studio
+1. Install Android Studio.
 2. Make sure the "Android Support Repository" is installed in the Android Studio SDK.
 3. Make sure the latest "Android SDK build-tools" is installed in the Android Studio SDK.
 4. Create a new Android Studio project. from the Quickstart pannel (use File > Close Project to see it), choose "Checkout from Version Control" then "git".
-5. Paste the URL for the TextSecure project when prompted (https://github.com/WhisperSystems/TextSecure.git)
-6. Android studio should detect the presence of a project file and ask you wethere to open it. Click "yes".
+5. Paste the URL for the TextSecure project when prompted (https://github.com/WhisperSystems/TextSecure.git).
+6. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
 7. Default config options should be good enough.
 8. Project initialisation and build should proceed.
 

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

@@ -0,0 +1,92 @@
+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/org/thoughtcrime/securesms/service/MmsReceiverTest.java

@@ -0,0 +1,28 @@
+package org.thoughtcrime.securesms.service;
+
+import android.content.Intent;
+import android.test.InstrumentationTestCase;
+
+import static org.fest.assertions.api.Assertions.*;
+
+public class MmsReceiverTest extends InstrumentationTestCase {
+
+  private MmsReceiver mmsReceiver;
+
+  public void setUp() throws Exception {
+    super.setUp();
+    mmsReceiver = new MmsReceiver(getInstrumentation().getContext());
+  }
+
+  public void tearDown() throws Exception {
+
+  }
+
+  public void testProcessMalformedData() throws Exception {
+    Intent intent = new Intent();
+    intent.setAction(SendReceiveService.RECEIVE_MMS_ACTION);
+    intent.putExtra("data", new byte[]{0x00});
+    mmsReceiver.process(null, intent);
+  }
+
+}

apntool/.gitignore

@@ -0,0 +1,2 @@
+*.db
+*.db.gz

apntool/apntool.py

@@ -0,0 +1,81 @@
+import sys
+import argparse
+import sqlite3
+import gzip
+from progressbar import ProgressBar, Counter, Timer
+from lxml import etree
+
+parser = argparse.ArgumentParser(prog='apntool', description="""Process Android's apn xml files and drop them into an easily
+                                                             queryable SQLite db. Tested up to version 9 of their APN file.""")
+parser.add_argument('-v', '--version', action='version', version='%(prog)s v1.0')
+parser.add_argument('-i', '--input', help='the xml file to parse', default='apns.xml', required=False)
+parser.add_argument('-o', '--output', help='the sqlite db output file', default='apns.db', required=False)
+parser.add_argument('--quiet', help='do not show progress or verbose instructions', action='store_true', required=False)
+parser.add_argument('--no-gzip', help="do not gzip after creation", action='store_true', required=False)
+args = parser.parse_args()
+
+try:
+    connection = sqlite3.connect(args.output)
+    cursor = connection.cursor()
+    cursor.execute('SELECT SQLITE_VERSION()')
+    version = cursor.fetchone()
+    if not args.quiet:
+        print("SQLite version: %s" % version)
+        print("Opening %s" % args.input)
+
+    cursor.execute("PRAGMA legacy_file_format=ON")
+    cursor.execute("PRAGMA journal_mode=DELETE")
+    cursor.execute("PRAGMA page_size=32768")
+    cursor.execute("VACUUM")
+    cursor.execute("DROP TABLE IF EXISTS apns")
+    cursor.execute("""CREATE TABLE apns(_id INTEGER PRIMARY KEY, mccmnc TEXT, mcc TEXT, mnc TEXT, carrier TEXT, apn TEXT,
+                mmsc TEXT, port INTEGER, type TEXT, protocol TEXT, bearer TEXT, roaming_protocol TEXT,
+                carrier_enabled INTEGER, mmsproxy TEXT, mmsport INTEGER, proxy TEXT,  mvno_match_data TEXT,
+                mvno_type TEXT, authtype INTEGER, user TEXT, password TEXT, server TEXT)""")
+
+    apns = etree.parse(args.input)
+    root = apns.getroot()
+    pbar = ProgressBar(widgets=['Processed: ', Counter(), ' apns (', Timer(), ')'], maxval=len(list(root))).start() if not args.quiet else None
+
+    count = 0
+    for apn in root.iter("apn"):
+        if apn.get("mmsc") == None:
+            continue
+        sqlvars = ["?" for x in apn.attrib.keys()] + ["?"]
+        mccmnc  = "%s%s" % (apn.get("mcc"), apn.get("mnc"))
+        values  = [apn.get(attrib) for attrib in apn.attrib.keys()] + [mccmnc]
+        keys    = apn.attrib.keys() + ["mccmnc"]
+
+        cursor.execute("SELECT 1 FROM apns WHERE mccmnc = ? AND apn = ?", [mccmnc, apn.get("apn")])
+        if cursor.fetchone() == None:
+            statement = "INSERT INTO apns (%s) VALUES (%s)" % (", ".join(keys), ", ".join(sqlvars))
+            cursor.execute(statement, values)
+
+        count += 1
+        if not args.quiet:
+            pbar.update(count)
+
+    if not args.quiet:
+        pbar.finish()
+    connection.commit()
+    print("Successfully written to %s" % args.output)
+
+    if not args.no_gzip:
+        gzipped_file = "%s.gz" % (args.output,)
+        with open(args.output, 'rb') as orig:
+            with gzip.open(gzipped_file, 'wb') as gzipped:
+                gzipped.writelines(orig)
+        print("Successfully gzipped to %s" % gzipped_file)
+
+    if not args.quiet:
+        print("\nTo include this in the distribution, copy it to the project's assets/databases/ directory.")
+        print("If you support API 10 or lower, you must use the gzipped version to avoid corruption.")
+
+except sqlite3.Error, e:
+    if connection:
+        connection.rollback()
+    print("Error: %s" % e.args[0])
+    sys.exit(1)
+finally:
+    if connection:
+        connection.close()

apntool/requirements.txt

@@ -0,0 +1,3 @@
+argparse>=1.2.1
+lxml>=3.3.3
+progressbar-latest>=2.4

build.gradle

@@ -1,47 +1,64 @@
 buildscript {
     repositories {
-        mavenCentral()
+        maven {
+            url "https://repo1.maven.org/maven2"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.11.+'
+        classpath 'com.android.tools.build:gradle:0.12.2'
         classpath files('libs/gradle-witness.jar')
     }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 apply plugin: 'witness'
 
 repositories {
-    mavenCentral()
+    maven {
+        url "https://repo1.maven.org/maven2"
+    }
     maven {
         url "https://raw.github.com/whispersystems/maven/master/gcm-client/releases/"
     }
     maven {
         url "https://raw.github.com/whispersystems/maven/master/gson/releases/"
     }
+    maven {
+        url "https://raw.github.com/whispersystems/maven/master/smil/releases/"
+    }
 }
 
 dependencies {
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-    compile 'com.android.support:support-v4:19.1.0'
-    compile 'com.google.android.gcm:gcm-client:1.0.2'
+    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.astuetz:pagerslidingtabstrip:1.0.1'
+    compile 'org.w3c:smil:1.0.0'
+    compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
 
     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')
 }
 
 dependencyVerification {
     verify = [
-        'com.actionbarsherlock:actionbarsherlock:5ab04d74101f70024b222e3ff9c87bee151ec43331b4a2134b6cc08cf8565819',
-        'com.android.support:support-v4:3f40fa7b3a4ead01ce15dce9453b061646e7fe2e7c51cb75ca01ee1e77037f3f',
-        'com.google.android.gcm:gcm-client:5ff578202f93dcba1c210d015deb4241c7cdad9b7867bd1b32e0a5f4c16986ca',
-        'se.emilsjolander:stickylistheaders:89146b46c96fea0e40200474a2625cda10fe94891e4128f53cdb42375091b9b6',
-        'com.google.protobuf:protobuf-java:ad9769a22989e688a46af4d3accc348cc501ced22118033230542bc916e33f0b',
-        'com.madgag:sc-light-jdk15on:931f39d351429fb96c2f749e7ecb1a256a8ebbf5edca7995c9cc085b94d1841d',
-        'com.googlecode.libphonenumber:libphonenumber:eba17eae81dd622ea89a00a3a8c025b2f25d342e0d9644c5b62e16f15687c3ab',
-        'org.whispersystems:gson:08f4f7498455d1539c9233e5aac18e9b1805815ef29221572996508eb512fe51',
+            'com.actionbarsherlock:actionbarsherlock:5ab04d74101f70024b222e3ff9c87bee151ec43331b4a2134b6cc08cf8565819',
+            'com.android.support:support-v4:81f2b1c2c94efd5a4ec7fcd97b6cdcd00e87a933905c5c86103c7319eb024572',
+            'se.emilsjolander:stickylistheaders:89146b46c96fea0e40200474a2625cda10fe94891e4128f53cdb42375091b9b6',
+            'com.google.android.gms:play-services:38f326e525830f1d70f60f594ceafcbdf5b312287ddbecd338fd1ed7958a4b1e',
+            'com.astuetz:pagerslidingtabstrip:f1641396732c7132a7abb837e482e5ee2b0ebb8d10813fc52bbaec2c15c184c2',
+            'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b',
+            'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
+            'com.android.support:support-annotations:1aa96ef0cc4a445bfc2f93ccf762305bc57fa107b12afe9d11f3863ae8a11036',
+            'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
+            'com.madgag:sc-light-jdk15on:931f39d351429fb96c2f749e7ecb1a256a8ebbf5edca7995c9cc085b94d1841d',
+            'com.googlecode.libphonenumber:libphonenumber:eba17eae81dd622ea89a00a3a8c025b2f25d342e0d9644c5b62e16f15687c3ab',
+            'org.whispersystems:gson:08f4f7498455d1539c9233e5aac18e9b1805815ef29221572996508eb512fe51',
     ]
 }
 
@@ -54,6 +71,11 @@ android {
         targetSdkVersion 19
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     android {
         sourceSets {
             main {
@@ -66,10 +88,10 @@ android {
                 assets.srcDirs = ['assets']
             }
             androidTest {
-                java.srcDirs = ['androidTest']
-                resources.srcDirs = ['androidTest']
-                aidl.srcDirs = ['androidTest']
-                renderscript.srcDirs = ['androidTest']
+                java.srcDirs = ['androidTest/java']
+                resources.srcDirs = ['androidTest/java']
+                aidl.srcDirs = ['androidTest/java']
+                renderscript.srcDirs = ['androidTest/java']
             }
         }
     }
@@ -88,6 +110,12 @@ android {
     }
 }
 
+tasks.whenTaskAdded { task ->
+    if (task.name.equals("lint")) {
+        task.enabled = false
+    }
+}
+
 def Properties props = new Properties()
 def propFile = new File('signing.properties')
 

jobqueue/.gitignore

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

jobqueue/build.gradle

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,193 @@
+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

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,51 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,81 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,73 @@
+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

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

jobqueue/src/main/AndroidManifest.xml

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

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

@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2013 Open Whisper Systems
+/**
+ * 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
@@ -14,24 +14,17 @@
  * 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.thoughtcrime.securesms;
+package org.whispersystems.jobqueue;
 
-import android.app.Application;
+public class EncryptionKeys {
 
-import org.thoughtcrime.securesms.crypto.PRNGFixes;
+  private transient final byte[] encoded;
 
-/**
- * Will be called once when the TextSecure process is created.
- *
- * We're using this as an insertion point to patch up the Android PRNG disaster.
- *
- * @author Moxie Marlinspike
- */
-public class ApplicationListener extends Application {
-
-  @Override
-  public void onCreate() {
-    PRNGFixes.apply();
+  public EncryptionKeys(byte[] encoded) {
+    this.encoded = encoded;
   }
 
+  public byte[] getEncoded() {
+    return encoded;
+  }
 }

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

@@ -0,0 +1,89 @@
+/**
+ * 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

@@ -0,0 +1,84 @@
+/**
+ * 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

@@ -0,0 +1,111 @@
+/**
+ * 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

@@ -0,0 +1,110 @@
+/**
+ * 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

@@ -0,0 +1,93 @@
+/**
+ * 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/dependencies/ContextDependent.java

@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2011 Whisper Systems
- * Copyright (C) 2013 Open Whisper Systems
+ * 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
@@ -15,17 +14,10 @@
  * 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.storage;
+package org.whispersystems.jobqueue.dependencies;
 
 import android.content.Context;
 
-public class LocalKeyRecord {
-
-  public static void delete(Context context, CanonicalRecipient recipient) {
-    Record.delete(context, Record.SESSIONS_DIRECTORY, getFileNameForRecipient(recipient));
-  }
-
-  private static String getFileNameForRecipient(CanonicalRecipient recipient) {
-    return recipient.getRecipientId() + "-local";
-  }
+public interface ContextDependent {
+  public void setContext(Context context);
 }