Add account management interface to libtextsecure api

src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.EncryptingPartDatabase;
 import org.thoughtcrime.securesms.database.PartDatabase;
 import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement;
-import org.thoughtcrime.securesms.push.TextSecureMessageReceiverFactory;
+import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.jobqueue.requirements.NetworkRequirement;
@@ -89,12 +89,13 @@ public class AttachmentDownloadJob extends MasterSecretJob {
   private void retrievePart(MasterSecret masterSecret, PduPart part, long messageId, long partId)
       throws IOException
   {
-    TextSecureMessageReceiver receiver       = TextSecureMessageReceiverFactory.create(context, masterSecret);
+    TextSecureMessageReceiver receiver       = TextSecureCommunicationFactory.createReceiver(context, masterSecret);
     EncryptingPartDatabase    database       = DatabaseFactory.getEncryptingPartDatabase(context, masterSecret);
     File                      attachmentFile = null;
 
     try {
       attachmentFile = createTempFile();
+
       TextSecureAttachmentPointer pointer    = createAttachmentPointer(masterSecret, part);
       InputStream                 attachment = receiver.retrieveAttachment(pointer, attachmentFile);
 

src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java

@@ -4,16 +4,18 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.util.Log;
 
+import org.thoughtcrime.securesms.Release;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement;
-import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
+import org.thoughtcrime.securesms.push.TextSecurePushTrustStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.GroupUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.jobqueue.requirements.NetworkRequirement;
 import org.whispersystems.libaxolotl.InvalidMessageException;
@@ -94,8 +96,12 @@ public class AvatarDownloadJob extends MasterSecretJob {
   }
 
   private File downloadAttachment(String relay, long contentLocation) throws IOException {
-    PushServiceSocket socket      = PushServiceSocketFactory.create(context);
-    File              destination = File.createTempFile("avatar", "tmp");
+    PushServiceSocket socket = new PushServiceSocket(Release.PUSH_URL,
+                                                     new TextSecurePushTrustStore(context),
+                                                     TextSecurePreferences.getLocalNumber(context),
+                                                     TextSecurePreferences.getPushServerPassword(context));
+
+    File destination = File.createTempFile("avatar", "tmp");
 
     destination.deleteOnExit();
 

src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java

@@ -0,0 +1,135 @@
+package org.thoughtcrime.securesms.jobs;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.crypto.storage.TextSecureAxolotlStore;
+import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement;
+import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
+import org.thoughtcrime.securesms.util.VisibleForTesting;
+import org.whispersystems.jobqueue.JobParameters;
+import org.whispersystems.libaxolotl.InvalidKeyIdException;
+import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
+import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
+import org.whispersystems.textsecure.api.TextSecureAccountManager;
+import org.whispersystems.textsecure.push.SignedPreKeyEntity;
+import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+public class CleanPreKeysJob extends MasterSecretJob {
+
+  private static final String TAG = CleanPreKeysJob.class.getSimpleName();
+
+  private static final int ARCHIVE_AGE_DAYS = 15;
+
+  public CleanPreKeysJob(Context context) {
+    super(context, JobParameters.newBuilder()
+                                .withGroupId(CleanPreKeysJob.class.getSimpleName())
+                                .withRequirement(new MasterSecretRequirement(context))
+                                .withRetryCount(5)
+                                .create());
+  }
+
+  @Override
+  public void onAdded() {
+
+  }
+
+  @Override
+  public void onRun() throws RequirementNotMetException, IOException {
+    try {
+      MasterSecret             masterSecret      = getMasterSecret();
+      SignedPreKeyStore        signedPreKeyStore = createSignedPreKeyStore(context, masterSecret);
+      TextSecureAccountManager accountManager    = createAccountManager(context);
+
+      SignedPreKeyEntity currentSignedPreKey = accountManager.getSignedPreKey();
+
+      if (currentSignedPreKey == null) return;
+
+      SignedPreKeyRecord       currentRecord = signedPreKeyStore.loadSignedPreKey(currentSignedPreKey.getKeyId());
+      List<SignedPreKeyRecord> allRecords    = signedPreKeyStore.loadSignedPreKeys();
+      List<SignedPreKeyRecord> oldRecords    = removeRecordFrom(currentRecord, allRecords);
+
+      Collections.sort(oldRecords, new SignedPreKeySorter());
+
+      Log.w(TAG, "Old signed prekey record count: " + oldRecords.size());
+
+      if (oldRecords.size() < 2) {
+        return;
+      }
+
+      SignedPreKeyRecord latestRecord                = oldRecords.get(0);
+      long               latestRecordArchiveDuration = System.currentTimeMillis() - latestRecord.getTimestamp();
+
+      if (latestRecordArchiveDuration >= TimeUnit.DAYS.toMillis(ARCHIVE_AGE_DAYS)) {
+        Iterator<SignedPreKeyRecord> iterator = oldRecords.iterator();
+        iterator.next();
+
+        while (iterator.hasNext()) {
+          SignedPreKeyRecord expiredRecord = iterator.next();
+          Log.w(TAG, "Removing signed prekey record: " + expiredRecord.getId() + " with timestamp: " + expiredRecord.getTimestamp());
+
+          signedPreKeyStore.removeSignedPreKey(expiredRecord.getId());
+        }
+      }
+    } catch (InvalidKeyIdException e) {
+      Log.w(TAG, e);
+    }
+  }
+
+  @Override
+  public boolean onShouldRetry(Throwable throwable) {
+    if (throwable instanceof RequirementNotMetException)         return true;
+    if (throwable instanceof NonSuccessfulResponseCodeException) return false;
+    if (throwable instanceof PushNetworkException)               return true;
+    return false;
+  }
+
+  @Override
+  public void onCanceled() {
+    Log.w(TAG, "Failed to execute clean signed prekeys task.");
+  }
+
+  private List<SignedPreKeyRecord> removeRecordFrom(SignedPreKeyRecord currentRecord,
+                                                    List<SignedPreKeyRecord> records)
+
+  {
+    List<SignedPreKeyRecord> others = new LinkedList<>();
+
+    for (SignedPreKeyRecord record : records) {
+      if (record.getId() != currentRecord.getId()) {
+        others.add(record);
+      }
+    }
+
+    return others;
+  }
+
+  @VisibleForTesting
+  protected TextSecureAccountManager createAccountManager(Context context) {
+    return TextSecureCommunicationFactory.createManager(context);
+  }
+
+  protected SignedPreKeyStore createSignedPreKeyStore(Context context, MasterSecret masterSecret) {
+    return new TextSecureAxolotlStore(context, masterSecret);
+  }
+
+  private static class SignedPreKeySorter implements Comparator<SignedPreKeyRecord> {
+    @Override
+    public int compare(SignedPreKeyRecord lhs, SignedPreKeyRecord rhs) {
+      if      (lhs.getTimestamp() < rhs.getTimestamp()) return -1;
+      else if (lhs.getTimestamp() > rhs.getTimestamp()) return 1;
+      else                                              return 0;
+    }
+  }
+
+}

src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java

@@ -4,7 +4,9 @@ import android.content.Context;
 import android.util.Log;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
-import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.crypto.PreKeyUtil;
+import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
 import org.thoughtcrime.securesms.util.ParcelUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.jobqueue.EncryptionKeys;
@@ -12,9 +14,7 @@ import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.jobqueue.requirements.NetworkRequirement;
 import org.whispersystems.libaxolotl.IdentityKeyPair;
 import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.crypto.PreKeyUtil;
-import org.whispersystems.textsecure.push.PushServiceSocket;
+import org.whispersystems.textsecure.api.TextSecureAccountManager;
 
 import java.io.IOException;
 
@@ -43,11 +43,11 @@ public class CreateSignedPreKeyJob extends ContextJob {
       return;
     }
 
-    IdentityKeyPair    identityKeyPair    = IdentityKeyUtil.getIdentityKeyPair(context, masterSecret);
-    SignedPreKeyRecord signedPreKeyRecord = PreKeyUtil.generateSignedPreKey(context, masterSecret, identityKeyPair);
-    PushServiceSocket  socket             = PushServiceSocketFactory.create(context);
+    IdentityKeyPair          identityKeyPair    = IdentityKeyUtil.getIdentityKeyPair(context, masterSecret);
+    SignedPreKeyRecord       signedPreKeyRecord = PreKeyUtil.generateSignedPreKey(context, masterSecret, identityKeyPair);
+    TextSecureAccountManager accountManager     = TextSecureCommunicationFactory.createManager(context);
 
-    socket.setCurrentSignedPreKey(signedPreKeyRecord);
+    accountManager.setSignedPreKey(signedPreKeyRecord);
     TextSecurePreferences.setSignedPreKeyRegistered(context, true);
   }
 

src/org/thoughtcrime/securesms/jobs/DeliveryReceiptJob.java

@@ -3,13 +3,19 @@ package org.thoughtcrime.securesms.jobs;
 import android.content.Context;
 import android.util.Log;
 
-import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
+import org.thoughtcrime.securesms.Release;
+import org.thoughtcrime.securesms.push.TextSecurePushTrustStore;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.jobqueue.requirements.NetworkRequirement;
-import org.whispersystems.textsecure.push.PushServiceSocket;
+import org.whispersystems.libaxolotl.util.guava.Optional;
+import org.whispersystems.textsecure.api.TextSecureMessageSender;
+import org.whispersystems.textsecure.push.PushAddress;
 import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
 
+import java.io.IOException;
+
 public class DeliveryReceiptJob extends ContextJob {
 
   private static final String TAG = DeliveryReceiptJob.class.getSimpleName();
@@ -34,10 +40,17 @@ public class DeliveryReceiptJob extends ContextJob {
   public void onAdded() {}
 
   @Override
-  public void onRun() throws Throwable {
+  public void onRun() throws IOException {
     Log.w("DeliveryReceiptJob", "Sending delivery receipt...");
-    PushServiceSocket socket = PushServiceSocketFactory.create(context);
-    socket.sendReceipt(destination, timestamp, relay);
+    TextSecureMessageSender messageSender =
+        new TextSecureMessageSender(Release.PUSH_URL,
+                                    new TextSecurePushTrustStore(context),
+                                    TextSecurePreferences.getLocalNumber(context),
+                                    TextSecurePreferences.getPushServerPassword(context),
+                                    null, Optional.<TextSecureMessageSender.EventListener>absent());
+
+    PushAddress pushAddress = new PushAddress(-1, destination, 1, relay);
+    messageSender.sendDeliveryReceipt(pushAddress, timestamp);
   }
 
   @Override

src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java

@@ -8,11 +8,12 @@ import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.gcm.GoogleCloudMessaging;
 
-import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
+import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.jobqueue.requirements.NetworkRequirement;
-import org.whispersystems.textsecure.push.PushServiceSocket;
+import org.whispersystems.libaxolotl.util.guava.Optional;
+import org.whispersystems.textsecure.api.TextSecureAccountManager;
 import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
 
 public class GcmRefreshJob extends ContextJob {
@@ -40,10 +41,11 @@ public class GcmRefreshJob extends ContextJob {
         Toast.makeText(context, "Unable to register with GCM!", Toast.LENGTH_LONG).show();
       }
 
-      String            gcmId  = GoogleCloudMessaging.getInstance(context).register(REGISTRATION_ID);
-      PushServiceSocket socket = PushServiceSocketFactory.create(context);
+      String                   gcmId          = GoogleCloudMessaging.getInstance(context).register(REGISTRATION_ID);
+      TextSecureAccountManager accountManager = TextSecureCommunicationFactory.createManager(context);
+
+      accountManager.setGcmId(Optional.of(gcmId));
 
-      socket.registerGcmId(gcmId);
       TextSecurePreferences.setGcmRegistrationId(context, gcmId);
     }
   }

src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement;
 import org.thoughtcrime.securesms.mms.PartParser;
-import org.thoughtcrime.securesms.push.TextSecureMessageSenderFactory;
+import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.Recipients;
@@ -106,7 +106,7 @@ public class PushGroupSendJob extends PushSendJob {
   private void deliver(MasterSecret masterSecret, SendReq message)
       throws IOException, RecipientFormattingException, InvalidNumberException, EncapsulatedExceptions
   {
-    TextSecureMessageSender    messageSender = TextSecureMessageSenderFactory.create(context, masterSecret);
+    TextSecureMessageSender    messageSender = TextSecureCommunicationFactory.createSender(context, masterSecret);
     byte[]                     groupId       = GroupUtil.getDecodedId(message.getTo()[0].getString());
     Recipients                 recipients    = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupId, false);
     List<PushAddress>          addresses     = getPushAddresses(recipients);

src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.mms.PartParser;
-import org.thoughtcrime.securesms.push.TextSecureMessageSenderFactory;
+import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
@@ -98,7 +98,7 @@ public class PushMediaSendJob extends PushSendJob {
              InsecureFallbackApprovalException, UntrustedIdentityException
   {
     MmsDatabase             database               = DatabaseFactory.getMmsDatabase(context);
-    TextSecureMessageSender messageSender          = TextSecureMessageSenderFactory.create(context, masterSecret);
+    TextSecureMessageSender messageSender          = TextSecureCommunicationFactory.createSender(context, masterSecret);
     String                  destination            = message.getTo()[0].getString();
     boolean                 isSmsFallbackSupported = isSmsFallbackSupported(context, destination);
 

src/org/thoughtcrime/securesms/jobs/PushReceiveJob.java

@@ -10,8 +10,8 @@ import org.whispersystems.jobqueue.JobManager;
 import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.libaxolotl.InvalidVersionException;
 import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
-import org.whispersystems.textsecure.directory.Directory;
-import org.whispersystems.textsecure.directory.NotInDirectoryException;
+import org.thoughtcrime.securesms.database.TextSecureDirectory;
+import org.thoughtcrime.securesms.database.NotInDirectoryException;
 import org.whispersystems.textsecure.push.ContactTokenDetails;
 
 import java.io.IOException;
@@ -40,7 +40,7 @@ public class PushReceiveJob extends ContextJob {
       TextSecureEnvelope envelope   = new TextSecureEnvelope(data, sessionKey);
 
       if (!isActiveNumber(context, envelope.getSource())) {
-        Directory           directory           = Directory.getInstance(context);
+        TextSecureDirectory directory           = TextSecureDirectory.getInstance(context);
         ContactTokenDetails contactTokenDetails = new ContactTokenDetails();
         contactTokenDetails.setNumber(envelope.getSource());
 
@@ -85,7 +85,7 @@ public class PushReceiveJob extends ContextJob {
     boolean isActiveNumber;
 
     try {
-      isActiveNumber = Directory.getInstance(context).isActiveNumber(e164number);
+      isActiveNumber = TextSecureDirectory.getInstance(context).isActiveNumber(e164number);
     } catch (NotInDirectoryException e) {
       isActiveNumber = false;
     }

src/org/thoughtcrime/securesms/jobs/PushSendJob.java

@@ -15,7 +15,7 @@ import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.jobqueue.requirements.NetworkRequirement;
 import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
 import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream;
-import org.whispersystems.textsecure.directory.Directory;
+import org.thoughtcrime.securesms.database.TextSecureDirectory;
 import org.whispersystems.textsecure.push.PushAddress;
 import org.whispersystems.textsecure.util.InvalidNumberException;
 
@@ -57,13 +57,13 @@ public abstract class PushSendJob extends MasterSecretJob {
       return false;
     }
 
-    Directory directory = Directory.getInstance(context);
+    TextSecureDirectory directory = TextSecureDirectory.getInstance(context);
     return directory.isSmsFallbackSupported(destination);
   }
 
   protected PushAddress getPushAddress(Recipient recipient) throws InvalidNumberException {
     String e164number = Util.canonicalizeNumber(context, recipient.getNumber());
-    String relay      = Directory.getInstance(context).getRelay(e164number);
+    String relay      = TextSecureDirectory.getInstance(context).getRelay(e164number);
     return new PushAddress(recipient.getRecipientId(), e164number, 1, relay);
   }
 

src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java

@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.database.EncryptingSmsDatabase;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
-import org.thoughtcrime.securesms.push.TextSecureMessageSenderFactory;
+import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.sms.IncomingIdentityUpdateMessage;
@@ -85,7 +85,7 @@ public class PushTextSendJob extends PushSendJob {
 
     try {
       PushAddress             address       = getPushAddress(message.getIndividualRecipient());
-      TextSecureMessageSender messageSender = TextSecureMessageSenderFactory.create(context, masterSecret);
+      TextSecureMessageSender messageSender = TextSecureCommunicationFactory.createSender(context, masterSecret);
 
       if (message.isEndSession()) {
         messageSender.sendMessage(address, new TextSecureMessage(message.getDateSent(), null,

src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java

@@ -0,0 +1,85 @@
+package org.thoughtcrime.securesms.jobs;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.crypto.PreKeyUtil;
+import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement;
+import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.whispersystems.jobqueue.JobParameters;
+import org.whispersystems.jobqueue.requirements.NetworkRequirement;
+import org.whispersystems.libaxolotl.IdentityKeyPair;
+import org.whispersystems.libaxolotl.state.PreKeyRecord;
+import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
+import org.whispersystems.textsecure.api.TextSecureAccountManager;
+import org.whispersystems.textsecure.push.PushServiceSocket;
+import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+
+import java.io.IOException;
+import java.util.List;
+
+public class RefreshPreKeysJob extends MasterSecretJob {
+
+  private static final String TAG = RefreshPreKeysJob.class.getSimpleName();
+
+  private static final int PREKEY_MINIMUM = 10;
+
+  public RefreshPreKeysJob(Context context) {
+    super(context, JobParameters.newBuilder()
+                                .withGroupId(RefreshPreKeysJob.class.getSimpleName())
+                                .withRequirement(new NetworkRequirement(context))
+                                .withRequirement(new MasterSecretRequirement(context))
+                                .withRetryCount(5)
+                                .create());
+  }
+
+  @Override
+  public void onAdded() {
+
+  }
+
+  @Override
+  public void onRun() throws RequirementNotMetException, IOException {
+    if (!TextSecurePreferences.isPushRegistered(context)) return;
+
+    MasterSecret             masterSecret   = getMasterSecret();
+    TextSecureAccountManager accountManager = TextSecureCommunicationFactory.createManager(context);
+    int                      availableKeys  = accountManager.getPreKeysCount();
+
+    if (availableKeys >= PREKEY_MINIMUM && TextSecurePreferences.isSignedPreKeyRegistered(context)) {
+      Log.w(TAG, "Available keys sufficient: " + availableKeys);
+      return;
+    }
+
+    List<PreKeyRecord> preKeyRecords       = PreKeyUtil.generatePreKeys(context, masterSecret);
+    PreKeyRecord       lastResortKeyRecord = PreKeyUtil.generateLastResortKey(context, masterSecret);
+    IdentityKeyPair    identityKey         = IdentityKeyUtil.getIdentityKeyPair(context, masterSecret);
+    SignedPreKeyRecord signedPreKeyRecord  = PreKeyUtil.generateSignedPreKey(context, masterSecret, identityKey);
+
+    Log.w(TAG, "Registering new prekeys...");
+
+    accountManager.setPreKeys(identityKey.getPublicKey(), lastResortKeyRecord, signedPreKeyRecord, preKeyRecords);
+
+    TextSecurePreferences.setSignedPreKeyRegistered(context, true);
+//      PreKeyService.initiateClean(context, masterSecret);
+  }
+
+  @Override
+  public boolean onShouldRetry(Throwable throwable) {
+    if (throwable instanceof RequirementNotMetException)         return true;
+    if (throwable instanceof NonSuccessfulResponseCodeException) return false;
+    if (throwable instanceof PushNetworkException)               return true;
+
+    return false;
+  }
+
+  @Override
+  public void onCanceled() {
+
+  }
+
+}