remove unneeded parameters from Job object

src/org/thoughtcrime/securesms/jobmanager/Job.java

@@ -60,14 +60,6 @@ public abstract class Job implements Serializable {
     return parameters.isPersistent();
   }
 
-  public EncryptionKeys getEncryptionKeys() {
-    return parameters.getEncryptionKeys();
-  }
-
-  public void setEncryptionKeys(EncryptionKeys keys) {
-    parameters.setEncryptionKeys(keys);
-  }
-
   public int getRetryCount() {
     return parameters.getRetryCount();
   }

src/org/thoughtcrime/securesms/jobmanager/JobManager.java

@@ -26,12 +26,10 @@ import org.thoughtcrime.securesms.jobmanager.requirements.RequirementListener;
 import org.thoughtcrime.securesms.jobmanager.requirements.RequirementProvider;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * A JobManager allows you to enqueue {@link org.thoughtcrime.securesms.jobmanager.Job} tasks
@@ -42,7 +40,6 @@ 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 Context                     context;
   private final PersistentStorage           persistentStorage;
@@ -77,12 +74,6 @@ public class JobManager implements RequirementListener {
     return new Builder(context);
   }
 
-  public void setEncryptionKeys(EncryptionKeys keys) {
-    if (hasLoadedEncrypted.compareAndSet(false, true)) {
-      eventExecutor.execute(new LoadTask(keys));
-    }
-  }
-
   /**
    * Queue a {@link org.thoughtcrime.securesms.jobmanager.Job} to be executed.
    *

src/org/thoughtcrime/securesms/jobmanager/JobParameters.java

@@ -30,10 +30,7 @@ public class JobParameters implements Serializable {
 
   private static final long serialVersionUID = 4880456378402584584L;
 
-  private transient EncryptionKeys encryptionKeys;
-
   private final List<Requirement> requirements;
-  private final boolean           isPersistent;
   private final int               retryCount;
   private final long              retryUntil;
   private final String            groupId;
@@ -41,15 +38,12 @@ public class JobParameters implements Serializable {
   private final long              wakeLockTimeout;
 
   private JobParameters(List<Requirement> requirements,
-                        boolean isPersistent, String groupId,
-                        EncryptionKeys encryptionKeys,
+                        String groupId,
                         int retryCount, long retryUntil, boolean wakeLock,
                         long wakeLockTimeout)
   {
     this.requirements    = requirements;
-    this.isPersistent    = isPersistent;
     this.groupId         = groupId;
-    this.encryptionKeys  = encryptionKeys;
     this.retryCount      = retryCount;
     this.retryUntil      = retryUntil;
     this.wakeLock        = wakeLock;
@@ -61,15 +55,7 @@ public class JobParameters implements Serializable {
   }
 
   public boolean isPersistent() {
-    return isPersistent;
-  }
-
-  public EncryptionKeys getEncryptionKeys() {
-    return encryptionKeys;
-  }
-
-  public void setEncryptionKeys(EncryptionKeys encryptionKeys) {
-    this.encryptionKeys = encryptionKeys;
+    return false;
   }
 
   public int getRetryCount() {
@@ -101,8 +87,6 @@ public class JobParameters implements Serializable {
 
   public static class Builder {
     private List<Requirement> requirements    = new LinkedList<>();
-    private boolean           isPersistent    = false;
-    private EncryptionKeys    encryptionKeys  = null;
     private int               retryCount      = 100;
     private long              retryDuration   = 0;
     private String            groupId         = null;
@@ -120,26 +104,6 @@ public class JobParameters implements Serializable {
       return this;
     }
 
-    /**
-     * Specify that the Job should be durably persisted to disk, so that it remains in the queue
-     * across application restarts.
-     * @return The builder.
-     */
-    public Builder withPersistence() {
-      this.isPersistent = true;
-      return this;
-    }
-
-    /**
-     * Specify that the job should use encryption when durably persisted to disk.
-     * @param encryptionKeys The keys to encrypt the serialized job with before persisting.
-     * @return the builder.
-     */
-    public Builder withEncryption(EncryptionKeys encryptionKeys) {
-      this.encryptionKeys = encryptionKeys;
-      return this;
-    }
-
     /**
      * Specify how many times the job should be retried if execution fails but onShouldRetry() returns
      * true.
@@ -200,7 +164,7 @@ public class JobParameters implements Serializable {
      * @return the JobParameters instance that describes a Job.
      */
     public JobParameters create() {
-      return new JobParameters(requirements, isPersistent, groupId, encryptionKeys, retryCount, System.currentTimeMillis() + retryDuration, wakeLock, wakeLockTimeout);
+      return new JobParameters(requirements, groupId, retryCount, System.currentTimeMillis() + retryDuration, wakeLock, wakeLockTimeout);
     }
   }
 }

src/org/thoughtcrime/securesms/jobmanager/persistence/PersistentStorage.java

@@ -57,7 +57,7 @@ public class PersistentStorage {
   public void store(Job job) throws IOException {
     ContentValues contentValues = new ContentValues();
     contentValues.put(ITEM, jobSerializer.serialize(job));
-    contentValues.put(ENCRYPTED, job.getEncryptionKeys() != null);
+    contentValues.put(ENCRYPTED, false);
 
     long id = databaseHelper.getWritableDatabase().insert(TABLE_NAME, null, contentValues);
     job.setPersistentId(id);
@@ -88,7 +88,6 @@ public class PersistentStorage {
           Job job = jobSerializer.deserialize(keys, encrypted, item);
 
           job.setPersistentId(id);
-          job.setEncryptionKeys(keys);
 
           results.add(job);
         } catch (IOException e) {