fixed cancel/cancelAll

evant · Nov 9, 2014 · 7d70ab7 · 7d70ab7
1 parent 8735e6e
commit 7d70ab7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/src/main/java/me/tatarka/support/server/job/JobServiceCompat.java b/lib/src/main/java/me/tatarka/support/server/job/JobServiceCompat.java
@@ -6,12 +6,15 @@
 import android.os.PowerManager;
 import android.support.v4.content.WakefulBroadcastReceiver;
 
+import org.apache.http.entity.ContentProducer;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import me.tatarka.support.internal.util.ArraySet;
 import me.tatarka.support.job.JobInfo;
 import me.tatarka.support.server.job.controllers.BootReceiver;
+import me.tatarka.support.server.job.controllers.ControllerPrefs;
 import me.tatarka.support.server.job.controllers.IdleReceiver;
 import me.tatarka.support.server.job.controllers.JobStatus;
 import me.tatarka.support.server.job.controllers.NetworkReceiver;
@@ -123,6 +126,11 @@ private void scheduleJob(JobStatus job) {
 
     private void handleCancelJob(int jobId) {
         unscheduleJob(jobId);
+        JobStore jobStore = JobStore.initAndGet(this);
+        synchronized (jobStore) {
+            JobStatus job = jobStore.getJobByJobId(jobId);
+            jobStore.remove(job);
+        }
         JobSchedulerService.stopJob(this, jobId);
     }
 
@@ -134,6 +142,7 @@ private void handleCancelAll() {
                 JobStatus jobStatus = jobStatuses.valueAt(i);
                 unscheduleJob(jobStatus.getJobId());
             }
+            jobStore.clear();
         }
         JobSchedulerService.stopAll(this);
     }
@@ -162,6 +171,8 @@ private void handleRunJobs() {
     }
 
     private void handleBoot() {
+        ControllerPrefs.getInstance(this).clear();
+
         JobStore jobStore = JobStore.initAndGet(this);
         synchronized (jobStore) {
             ArraySet<JobStatus> jobStatuses = jobStore.getJobs();

diff --git a/lib/src/main/java/me/tatarka/support/server/job/controllers/ControllerPrefs.java b/lib/src/main/java/me/tatarka/support/server/job/controllers/ControllerPrefs.java
@@ -6,7 +6,7 @@
 /**
  * Created by evantatarka on 11/8/14.
  */
-class ControllerPrefs {
+public class ControllerPrefs {
     private static final String PREFS_NAME = "me.tatarka.support.job.controllers.PREFS";
     private static final String KEY_BATTERY_LOW = "battery_low";
     private static final String KEY_NEXT_JOB_EXPIRED_ELAPSED_MILLIS = "next_job_expired_elapsed_millis";
@@ -15,7 +15,7 @@ class ControllerPrefs {
 
     private static ControllerPrefs sInstance;
 
-    static ControllerPrefs getInstance(Context context) {
+    public static ControllerPrefs getInstance(Context context) {
         if (sInstance == null) {
             sInstance = new ControllerPrefs(context);
         }
@@ -48,6 +48,10 @@ Editor edit() {
         return new Editor(prefs.edit());
     }
 
+    public void clear() {
+        prefs.edit().clear().apply();
+    }
+
     static class Editor {
         SharedPreferences.Editor editor;