Move 'clear' to new preferences

api/src/main/java/com/todoroo/andlib/utility/Preferences.java

@@ -235,15 +235,4 @@ public class Preferences {
         editor.putLong(key, value);
         editor.commit();
     }
-
-    /**
-     * Clears a preference
-     */
-    public static void clear(String key) {
-        Context context = ContextManager.getContext();
-        Editor editor = getPrefs(context).edit();
-        editor.remove(key);
-        editor.commit();
-    }
-
 }

astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java

@@ -1,7 +1,6 @@
 package com.todoroo.astrid.subtasks;
 
 import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.core.CoreFilterExposer;
 import com.todoroo.astrid.dao.TaskListMetadataDao;
@@ -11,6 +10,8 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.subtasks.AstridOrderedListUpdater.Node;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import org.tasks.preferences.Preferences;
+
 /**
  * Contains useful methods common to all subtasks tests
  * @author Sam
@@ -20,6 +21,7 @@ public class SubtasksTestCase extends DatabaseTestCase {
 
     @Autowired TaskListMetadataDao taskListMetadataDao;
     @Autowired TaskService taskService;
+    @Autowired Preferences preferences;
 
     protected SubtasksUpdater<TaskListMetadata> updater;
     protected Filter filter;
@@ -39,7 +41,7 @@ public class SubtasksTestCase extends DatabaseTestCase {
     protected void setUp() throws Exception {
         super.setUp();
         filter = CoreFilterExposer.buildInboxFilter(getContext().getResources());
-        Preferences.clear(SubtasksUpdater.ACTIVE_TASKS_ORDER);
+        preferences.clear(SubtasksUpdater.ACTIVE_TASKS_ORDER);
         updater = new SubtasksFilterUpdater(taskListMetadataDao, taskService);
     }
 

astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java

@@ -5,7 +5,6 @@
  */
 package com.todoroo.astrid.calls;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -18,22 +17,29 @@ import android.util.Log;
 
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
-import com.todoroo.andlib.utility.Preferences;
 
 import org.tasks.R;
+import org.tasks.injection.InjectingBroadcastReceiver;
+import org.tasks.preferences.Preferences;
+
+import javax.inject.Inject;
 
 import static org.tasks.date.DateTimeUtils.newDate;
 
-public class PhoneStateChangedReceiver extends BroadcastReceiver {
+public class PhoneStateChangedReceiver extends InjectingBroadcastReceiver {
 
     private static final String PREF_LAST_INCOMING_NUMBER = "last_incoming_number";
 
     private static final long WAIT_BEFORE_READ_LOG = 3000L;
 
+    @Inject Preferences preferences;
+
     @Override
     public void onReceive(final Context context, Intent intent) {
-        if (!Preferences.getBoolean(R.string.p_field_missed_calls, false)) {
-            Preferences.clear(PREF_LAST_INCOMING_NUMBER);
+        super.onReceive(context, intent);
+
+        if (!preferences.getBoolean(R.string.p_field_missed_calls, false)) {
+            preferences.clear(PREF_LAST_INCOMING_NUMBER);
             return;
         }
 
@@ -45,14 +51,14 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
                 return;
             }
 
-            Preferences.setString(PREF_LAST_INCOMING_NUMBER, number);
+            preferences.setString(PREF_LAST_INCOMING_NUMBER, number);
         } else if (TelephonyManager.EXTRA_STATE_IDLE.equals(state)) {
-            final String lastNumber = Preferences.getStringValue(PREF_LAST_INCOMING_NUMBER);
+            final String lastNumber = preferences.getStringValue(PREF_LAST_INCOMING_NUMBER);
             if (TextUtils.isEmpty(lastNumber)) {
                 return;
             }
 
-            Preferences.clear(PREF_LAST_INCOMING_NUMBER);
+            preferences.clear(PREF_LAST_INCOMING_NUMBER);
 
             new Thread() {
                 @Override

astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java

@@ -12,12 +12,12 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.todoroo.andlib.utility.DialogUtilities;
-import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.utility.AstridPreferences;
 
 import org.tasks.R;
+import org.tasks.preferences.Preferences;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -27,9 +27,11 @@ public final class UpgradeService {
 
     public static final int V4_6_5 = 306;
     public static final int V3_0_0 = 136;
+    private final Preferences preferences;
 
     @Inject
-    public UpgradeService() {
+    public UpgradeService(Preferences preferences) {
+        this.preferences = preferences;
     }
 
     /**
@@ -38,7 +40,7 @@ public final class UpgradeService {
      * show users a change log.
      */
     public void performUpgrade(final Activity context, final int from) {
-        Preferences.setInt(AstridPreferences.P_UPGRADE_FROM, from);
+        preferences.setInt(AstridPreferences.P_UPGRADE_FROM, from);
 
         int maxWithUpgrade = V4_6_5;
 
@@ -102,7 +104,7 @@ public final class UpgradeService {
             return;
         }
 
-        Preferences.clear(AstridPreferences.P_UPGRADE_FROM);
+        preferences.clear(AstridPreferences.P_UPGRADE_FROM);
         StringBuilder changeLog = new StringBuilder();
 
         if (from >= 0 && from < V4_6_5) {

astrid/src/main/java/org/tasks/injection/BroadcastModule.java

@@ -4,6 +4,7 @@ import android.content.Context;
 
 import com.todoroo.astrid.alarms.AlarmDetailExposer;
 import com.todoroo.astrid.alarms.AlarmTaskRepeatListener;
+import com.todoroo.astrid.calls.PhoneStateChangedReceiver;
 import com.todoroo.astrid.gcal.GCalTaskCompleteListener;
 import com.todoroo.astrid.gtasks.GtasksCustomFilterCriteriaExposer;
 import com.todoroo.astrid.gtasks.GtasksDetailExposer;
@@ -44,7 +45,8 @@ import static org.tasks.injection.TasksModule.ForApplication;
                 RepeatTaskCompleteListener.class,
                 AlarmTaskRepeatListener.class,
                 AlarmDetailExposer.class,
-                GtasksStartupReceiver.class
+                GtasksStartupReceiver.class,
+                PhoneStateChangedReceiver.class
         })
 public class BroadcastModule {