diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
index 8a5509cbe8..448f4a6fc8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
@@ -32,8 +32,10 @@ public abstract class Job {
 
   private final Parameters parameters;
 
-  private int    runAttempt;
-  private long   nextRunAttemptTime;
+  private int  runAttempt;
+  private long nextRunAttemptTime;
+
+  private volatile boolean canceled;
 
   protected Context context;
 
@@ -75,12 +77,27 @@ public abstract class Job {
     this.nextRunAttemptTime = nextRunAttemptTime;
   }
 
+  /** Should only be invoked by {@link JobController} */
+  final void cancel() {
+    this.canceled = true;
+  }
+
   @WorkerThread
   final void onSubmit() {
     Log.i(TAG, JobLogger.format(this, "onSubmit()"));
     onAdded();
   }
 
+  /**
+   * @return True if your job has been marked as canceled while it was running, otherwise false.
+   *         If a job sees that it has been canceled, it should make a best-effort attempt at
+   *         stopping it's work. This job will have {@link #onFailure()} called after {@link #run()}
+   *         has finished.
+   */
+  public final boolean isCanceled() {
+    return canceled;
+  }
+
   /**
    * Called when the job is first submitted to the {@link JobManager}.
    */
@@ -112,10 +129,10 @@ public abstract class Job {
   public abstract @NonNull Result run();
 
   /**
-   * Called when your job has completely failed.
+   * Called when your job has completely failed and will not be run again.
    */
   @WorkerThread
-  public abstract void onCanceled();
+  public abstract void onFailure();
 
   public interface Factory<T extends Job> {
     @NonNull T create(@NonNull Parameters parameters, @NonNull Data data);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java
index c24fbe5860..59cfae6fa8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java
@@ -17,11 +17,12 @@ import org.thoughtcrime.securesms.util.Debouncer;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 
 /**
  * Manages the queue of jobs. This is the only class that should write to {@link JobStorage} to
@@ -40,7 +41,7 @@ class JobController {
   private final Scheduler              scheduler;
   private final Debouncer              debouncer;
   private final Callback               callback;
-  private final Set<String>            runningJobs;
+  private final Map<String, Job>       runningJobs;
 
   JobController(@NonNull Application application,
                 @NonNull JobStorage jobStorage,
@@ -61,7 +62,7 @@ class JobController {
     this.scheduler              = scheduler;
     this.debouncer              = debouncer;
     this.callback               = callback;
-    this.runningJobs            = new HashSet<>();
+    this.runningJobs            = new HashMap<>();
   }
 
   @WorkerThread
@@ -96,6 +97,29 @@ class JobController {
     notifyAll();
   }
 
+  @WorkerThread
+  synchronized void cancelJob(@NonNull String id) {
+    Job runningJob = runningJobs.get(id);
+
+    if (runningJob != null) {
+      Log.w(TAG, JobLogger.format(runningJob, "Canceling while running."));
+      runningJob.cancel();
+    } else {
+      JobSpec jobSpec = jobStorage.getJobSpec(id);
+
+      if (jobSpec != null) {
+        Job job = createJob(jobSpec, jobStorage.getConstraintSpecs(id));
+        Log.w(TAG, JobLogger.format(job, "Canceling while inactive."));
+        Log.w(TAG, JobLogger.format(job, "Job failed."));
+
+        job.onFailure();
+        onFailure(job);
+      } else {
+        Log.w(TAG, "Tried to cancel JOB::" + id + ", but it could not be found.");
+      }
+    }
+  }
+
   @WorkerThread
   synchronized void onRetry(@NonNull Job job) {
     int    nextRunAttempt     = job.getRunAttempt() + 1;
@@ -177,7 +201,7 @@ class JobController {
       }
 
       jobStorage.updateJobRunningState(job.getId(), true);
-      runningJobs.add(job.getId());
+      runningJobs.put(job.getId(), job);
       jobTracker.onStateChange(job.getId(), JobTracker.JobState.RUNNING);
 
       return job;
@@ -333,7 +357,7 @@ class JobController {
 
       return job;
     } catch (RuntimeException e) {
-      Log.e(TAG, "Failed to instantiate job! Failing it and its dependencies without calling Job#onCanceled. Crash imminent.");
+      Log.e(TAG, "Failed to instantiate job! Failing it and its dependencies without calling Job#onFailure. Crash imminent.");
 
       List<String> failIds = Stream.of(jobStorage.getDependencySpecsThatDependOnJob(jobSpec.getId()))
                                    .map(DependencySpec::getJobId)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
index 52124ac42c..c1b533af3a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
@@ -112,7 +112,6 @@ public class JobManager implements ConstraintObserver.Notifier {
     jobTracker.removeListener(listener);
   }
 
-
   /**
    * Enqueues a single job to be run.
    */
@@ -136,9 +135,22 @@ public class JobManager implements ConstraintObserver.Notifier {
     return new Chain(this, jobs);
   }
 
+  /**
+   * Attempts to cancel a job. This is best-effort and may not actually prevent a job from
+   * completing if it was already running. If this job is running, this can only stop jobs that
+   * bother to check {@link Job#isCanceled()}.
+   *
+   * When a job is canceled, {@link Job#onFailure()} will be triggered at the earliest possible
+   * moment. Just like a normal failure, all later jobs in the same chain will also be failed.
+   */
+  public void cancel(@NonNull String id) {
+    executor.execute(() -> jobController.cancelJob(id));
+  }
+
   /**
    * Retrieves a string representing the state of the job queue. Intended for debugging.
    */
+  @WorkerThread
   public @NonNull String getDebugInfo() {
     Future<String> result = executor.submit(jobController::getDebugInfo);
     try {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java
index afc89d8011..e04faa93df 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java
@@ -54,8 +54,8 @@ class JobRunner extends Thread {
         job.onRetry();
       } else if (result.isFailure()) {
         List<Job> dependents = jobController.onFailure(job);
-        job.onCanceled();
-        Stream.of(dependents).forEach(Job::onCanceled);
+        job.onFailure();
+        Stream.of(dependents).forEach(Job::onFailure);
 
         if (result.getException() != null) {
           throw result.getException();
@@ -80,6 +80,11 @@ class JobRunner extends Thread {
     try {
       wakeLock = WakeLockUtil.acquire(application, PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TIMEOUT, job.getId());
       result = job.run();
+
+      if (job.isCanceled()) {
+        Log.w(TAG, JobLogger.format(job, String.valueOf(id), "Failing because the job was canceled."));
+        result = Job.Result.failure();
+      }
     } catch (Exception e) {
       Log.w(TAG, JobLogger.format(job, String.valueOf(id), "Failing due to an unexpected exception."), e);
       return Job.Result.failure();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/Argon2TestJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/Argon2TestJob.java
index 1b558c95b3..34cb9b2151 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/Argon2TestJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/Argon2TestJob.java
@@ -181,9 +181,7 @@ public final class Argon2TestJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
-
-  }
+  public void onFailure() {}
 
   private static abstract class Argon2RuntimeException extends RuntimeException {
     private Argon2RuntimeException(String message) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
index 9600c74006..7975c60435 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
@@ -129,7 +129,7 @@ public final class AttachmentCompressionJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() { }
+  public void onFailure() { }
 
   @Override
   protected boolean onShouldRetry(@NonNull Exception exception) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java
index 2f81d60e77..13e0b2e6e7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCopyJob.java
@@ -83,7 +83,7 @@ public class AttachmentCopyJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() { }
+  public void onFailure() { }
 
   public static final class Factory implements Job.Factory<AttachmentCopyJob> {
     @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
index f5a5d3db0b..a52defe0aa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
@@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JobLogger;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.MmsException;
@@ -138,8 +139,8 @@ public class AttachmentDownloadJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
-    Log.w(TAG, "onCanceled() messageId: " + messageId + "  partRowId: " + partRowId + "  partUniqueId: " + partUniqueId + "  manual: " + manual);
+  public void onFailure() {
+    Log.w(TAG, JobLogger.format(this, "onFailure() messageId: " + messageId + "  partRowId: " + partRowId + "  partUniqueId: " + partUniqueId + "  manual: " + manual));
 
     final AttachmentId attachmentId = new AttachmentId(partRowId, partUniqueId);
     markFailed(messageId, attachmentId);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
index 2fa9143254..e897d34c4c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
@@ -115,7 +115,7 @@ public final class AttachmentUploadJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() { }
+  public void onFailure() { }
 
   @Override
   protected boolean onShouldRetry(@NonNull Exception exception) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
index 11a2faa445..aae85b7eb0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
@@ -105,7 +105,7 @@ public class AvatarDownloadJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {}
+  public void onFailure() {}
 
   @Override
   public boolean onShouldRetry(@NonNull Exception exception) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
index a69b3700b9..a6c8065cba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
@@ -96,7 +96,7 @@ public class CleanPreKeysJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Failed to execute clean signed prekeys task.");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
index c4c51d2f62..a58cd74bad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
@@ -67,7 +67,7 @@ public class CreateSignedPreKeyJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {}
+  public void onFailure() {}
 
   @Override
   public boolean onShouldRetry(@NonNull Exception exception) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java
index f57e29c29a..ccae62c3a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java
@@ -80,7 +80,7 @@ public class DirectoryRefreshJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {}
+  public void onFailure() {}
 
   public static final class Factory implements Job.Factory<DirectoryRefreshJob> {
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FailingJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FailingJob.java
index 87808eb965..d75ceabaf9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FailingJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FailingJob.java
@@ -34,7 +34,7 @@ public final class FailingJob extends Job {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   public static final class Factory implements Job.Factory<FailingJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
index 0811f05fd9..0dae4d8686 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
@@ -110,7 +110,7 @@ public class FcmRefreshJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "GCM reregistration failed after retry attempt exhaustion!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
index d14fda05b2..e031b59462 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
@@ -107,7 +107,7 @@ public class LocalBackupJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   public static class Factory implements Job.Factory<LocalBackupJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MarkerJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MarkerJob.java
index af443cff6c..b4a8be6f5a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MarkerJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MarkerJob.java
@@ -49,7 +49,7 @@ public final class MarkerJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   public static final class Factory implements Job.Factory<MarkerJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
index 19f69a461d..bb3bdf0fdd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
@@ -157,7 +157,7 @@ public class MmsDownloadJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
     database.markDownloadState(messageId, MmsDatabase.Status.DOWNLOAD_SOFT_FAILURE);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
index cac800e518..526a5d5016 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
@@ -88,7 +88,7 @@ public class MmsReceiveJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     // TODO
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java
index 9baf11d03d..7371c18584 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java
@@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JobLogger;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
@@ -152,8 +153,8 @@ public final class MmsSendJob extends SendJob {
   }
 
   @Override
-  public void onCanceled() {
-    Log.i(TAG, "onCanceled() messageId: " + messageId);
+  public void onFailure() {
+    Log.i(TAG, JobLogger.format(this, "onFailure() messageId: " + messageId));
     DatabaseFactory.getMmsDatabase(context).markAsSentFailed(messageId);
     notifyMediaMessageDeliveryFailed(context, messageId);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
index 146bbbb6a6..d848a647f7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
@@ -95,7 +95,7 @@ public class MultiDeviceBlockedUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   public static final class Factory implements Job.Factory<MultiDeviceBlockedUpdateJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
index 9734f54ca3..c5d384b65a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
@@ -101,7 +101,7 @@ public class MultiDeviceConfigurationUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "**** Failed to synchronize read receipts state!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
index 6629f5e635..b9c9870691 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -231,7 +231,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
 
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
index 58cb23e6ce..3d292d69de 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
@@ -133,7 +133,7 @@ public class MultiDeviceGroupUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
 
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java
index d6c8306d3a..128d0fd391 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java
@@ -79,7 +79,7 @@ public class MultiDeviceKeysUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   public static final class Factory implements Job.Factory<MultiDeviceKeysUpdateJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java
index e1d197e9be..74d666f2b7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java
@@ -61,7 +61,7 @@ public class MultiDeviceProfileContentUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Did not succeed!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
index 5e56634f02..f2007d83d6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
@@ -102,7 +102,7 @@ public class MultiDeviceProfileKeyUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Profile key sync failed!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
index c37cad988f..12d3552558 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
@@ -104,7 +104,7 @@ public class MultiDeviceReadUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
 
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
index 6087a89f86..354f9e4c5b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
@@ -101,7 +101,7 @@ public class MultiDeviceStickerPackOperationJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Failed to sync sticker pack operation!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
index 285914f810..0acaf96ff8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
@@ -83,7 +83,7 @@ public class MultiDeviceStickerPackSyncJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Failed to sync sticker pack operation!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java
index 07550ba148..15b288a14e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java
@@ -61,7 +61,7 @@ public class MultiDeviceStorageSyncRequestJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Did not succeed!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
index 74141a0476..d1acfe3b5a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
@@ -130,7 +130,7 @@ public class MultiDeviceVerifiedUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
 
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java
index 4bc6297c73..1dad76b4df 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java
@@ -90,7 +90,7 @@ public class MultiDeviceViewOnceOpenJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
 
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
index 5195509526..d28ac89d75 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
@@ -126,7 +126,7 @@ public final class PushDecryptMessageJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   private boolean needsMigration() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
index da157974b1..69ba9601ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -225,7 +225,7 @@ public class PushGroupSendJob extends PushSendJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     DatabaseFactory.getMmsDatabase(context).markAsSentFailed(messageId);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
index 138e95af9e..949eea3891 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
@@ -133,7 +133,7 @@ public class PushGroupUpdateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   public static final class Factory implements Job.Factory<PushGroupUpdateJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
index 72b0c8591b..8e86e9d469 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
@@ -174,7 +174,7 @@ public class PushMediaSendJob extends PushSendJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     DatabaseFactory.getMmsDatabase(context).markAsSentFailed(messageId);
     notifyMediaMessageDeliveryFailed(context, messageId);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
index a039a53339..c7add3571b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
@@ -63,7 +63,7 @@ public class PushNotificationReceiveJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "***** Failed to download pending message!");
 //    MessageNotifier.notifyMessagesPending(getContext());
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
index b73e3f5817..00aed7be01 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
@@ -242,7 +242,7 @@ public final class PushProcessMessageJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   private void handleMessage(@NonNull byte[] plaintextDataBuffer, @NonNull Optional<Long> smsMessageId) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
index 0b4d518eb9..b604d5021b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
@@ -134,7 +134,7 @@ public class PushTextSendJob extends PushSendJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
 
     long      threadId  = DatabaseFactory.getSmsDatabase(context).getThreadIdForMessage(messageId);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java
index e986da9ac3..ca9a084990 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java
@@ -185,7 +185,7 @@ public class ReactionSendJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     if (recipients.size() < initialRecipientCount) {
       Log.w(TAG, "Only sent a reaction to " + recipients.size() + "/" + initialRecipientCount + " recipients. Still, it sent to someone, so it stays.");
       return;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
index cc9fe9d762..590ee54696 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
@@ -71,7 +71,7 @@ public class RefreshAttributesJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Failed to update account attributes!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
index 681b139820..3de75c9ac6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
@@ -70,7 +70,7 @@ public class RefreshOwnProfileJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() { }
+  public void onFailure() { }
 
   private void setProfileName(@Nullable String encryptedName) {
     try {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
index 1a75118dc0..610443de76 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
@@ -87,7 +87,7 @@ public class RefreshPreKeysJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   public static final class Factory implements Job.Factory<RefreshPreKeysJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
index 8fa70e4e0a..0df50a2565 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
@@ -91,7 +91,7 @@ public class RequestGroupInfoJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
 
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
index f4614037b5..1c61fdbbfb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
@@ -131,7 +131,7 @@ public class RetrieveProfileAvatarJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   public static final class Factory implements Job.Factory<RetrieveProfileAvatarJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
index 6ab3e8a80f..b34f09f58f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
@@ -95,7 +95,7 @@ public class RetrieveProfileJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {}
+  public void onFailure() {}
 
   private void handleIndividualRecipient(Recipient recipient) throws IOException {
      if (recipient.hasServiceIdentifier()) handlePhoneNumberRecipient(recipient);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
index a4cdc12fc7..d3944ae7e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
@@ -67,7 +67,7 @@ public class RotateCertificateJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Failed to rotate sender certificate!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
index 8b45c5ed4c..9a78bf66a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
@@ -59,7 +59,7 @@ public class RotateProfileKeyJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
 
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
index 78b819fdec..9b03792d0c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
@@ -68,7 +68,7 @@ public class RotateSignedPreKeyJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     TextSecurePreferences.setSignedPreKeyFailureCount(context, TextSecurePreferences.getSignedPreKeyFailureCount(context) + 1);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
index 179c8afc76..4bd2a12de2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
@@ -93,7 +93,7 @@ public class SendDeliveryReceiptJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Failed to send delivery receipt to: " + recipientId);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
index f1dc5e7745..384a117f8e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
@@ -108,7 +108,7 @@ public class SendReadReceiptJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Failed to send read receipts to: " + recipientId);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
index bf6b8c7aee..6f2038a0e1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
@@ -86,7 +86,7 @@ public class ServiceOutageDetectionJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.i(TAG, "Service status check could not complete. Assuming success to avoid false positives due to bad network.");
     TextSecurePreferences.setServiceOutage(context, false);
     TextSecurePreferences.setLastOutageCheckTime(context, System.currentTimeMillis());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
index 0589ab1087..bf96e51ec4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
@@ -89,7 +89,7 @@ public class SmsReceiveJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
 
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
index 9de5898bbf..d83bb3fdd6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
@@ -98,8 +98,8 @@ public class SmsSendJob extends SendJob {
   }
 
   @Override
-  public void onCanceled() {
-    warn(TAG, "onCanceled() messageId: " + messageId);
+  public void onFailure() {
+    warn(TAG, "onFailure() messageId: " + messageId);
     long      threadId  = DatabaseFactory.getSmsDatabase(context).getThreadIdForMessage(messageId);
     Recipient recipient = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(threadId);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java
index 2b35275d24..cbd6698119 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java
@@ -84,7 +84,7 @@ public class SmsSentJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   private void handleDeliveredResult(long messageId, int result) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
index de198293ea..3a975dce64 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
@@ -98,7 +98,7 @@ public class StickerDownloadJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Failed to download sticker!");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
index e3f95e5cbd..912ec90977 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
@@ -167,7 +167,7 @@ public class StickerPackDownloadJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Failed to download manifest! Uninstalling pack.");
     DatabaseFactory.getStickerDatabase(context).uninstallPack(packId);
     DatabaseFactory.getStickerDatabase(context).deleteOrphanedPacks();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
index 147b9798ab..1ed52050a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
@@ -118,7 +118,7 @@ public class StorageForcePushJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   private static @NonNull Map<RecipientId, byte[]> generateNewKeys(@NonNull Map<RecipientId, byte[]> oldKeys) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
index 7a8f977d08..857cf00417 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
@@ -102,7 +102,7 @@ public class StorageSyncJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   private boolean performSync() throws IOException, RetryLaterException, InvalidKeyException {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
index fa28603a7a..8b7ff0f7f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
@@ -70,7 +70,7 @@ public class TrimThreadJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Canceling trim attempt: " + threadId);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java
index fdfe78625b..242270de30 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java
@@ -101,7 +101,7 @@ public class TypingSendJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
index 726ae73664..50a4b58fe1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
@@ -105,7 +105,7 @@ public class UpdateApkJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     Log.w(TAG, "Update check failed");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationCompleteJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationCompleteJob.java
index 072523927e..ee46f45338 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationCompleteJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationCompleteJob.java
@@ -48,7 +48,7 @@ public class MigrationCompleteJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     throw new AssertionError("This job should never fail.");
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java
index 35ba128eba..3b6992e81b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java
@@ -54,7 +54,7 @@ abstract class MigrationJob extends Job {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
     throw new AssertionError("This job should never fail. " + getClass().getSimpleName());
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java
index 63842de3cb..c0c5b11bd7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/RegistrationPinV2MigrationJob.java
@@ -99,7 +99,7 @@ public final class RegistrationPinV2MigrationJob extends BaseJob {
   }
 
   @Override
-  public void onCanceled() {
+  public void onFailure() {
   }
 
   public static class Factory implements Job.Factory<RegistrationPinV2MigrationJob> {