From 06ba4e944199e138f0018f21ecd8e9d891267fbd Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 31 May 2014 23:33:32 -0500 Subject: [PATCH] Remove getLong from old preferences --- .../com/todoroo/andlib/utility/Preferences.java | 10 ---------- .../todoroo/astrid/backup/BackupPreferences.java | 14 +++++++++----- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/api/src/main/java/com/todoroo/andlib/utility/Preferences.java b/api/src/main/java/com/todoroo/andlib/utility/Preferences.java index 229de9655..eda93f259 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/Preferences.java +++ b/api/src/main/java/com/todoroo/andlib/utility/Preferences.java @@ -215,14 +215,4 @@ public class Preferences { editor.putInt(key, value); editor.commit(); } - - // --- preference fetching (long) - - /** Gets a long preference - * @return default if value is unset otherwise the value - */ - public static long getLong(String key, long defValue) { - Context context = ContextManager.getContext(); - return getPrefs(context).getLong(key, defValue); - } } diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java index 5c6cbd01b..ad07542fb 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java @@ -15,11 +15,13 @@ import android.view.ViewGroup.OnHierarchyChangeListener; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; -import com.todoroo.andlib.utility.Preferences; -import com.todoroo.andlib.utility.TodorooPreferenceActivity; import com.todoroo.astrid.utility.Flags; import org.tasks.R; +import org.tasks.injection.InjectingTodorooPreferenceActivity; +import org.tasks.preferences.Preferences; + +import javax.inject.Inject; import static org.tasks.date.DateTimeUtils.newDate; @@ -30,7 +32,7 @@ import static org.tasks.date.DateTimeUtils.newDate; * @author timsu * */ -public class BackupPreferences extends TodorooPreferenceActivity { +public class BackupPreferences extends InjectingTodorooPreferenceActivity { static final String PREF_BACKUP_LAST_DATE = "backupDate"; //$NON-NLS-1$ @@ -38,6 +40,8 @@ public class BackupPreferences extends TodorooPreferenceActivity { private int statusColor = Color.BLACK; + @Inject Preferences preferences; + @Override public int getPreferenceResource() { return R.xml.preferences_backup; @@ -105,8 +109,8 @@ public class BackupPreferences extends TodorooPreferenceActivity { String subtitle = ""; //$NON-NLS-1$ // last backup was error - final long last = Preferences.getLong(PREF_BACKUP_LAST_DATE, 0); - final String error = Preferences.getStringValue(PREF_BACKUP_LAST_ERROR); + final long last = preferences.getLong(PREF_BACKUP_LAST_DATE, 0); + final String error = preferences.getStringValue(PREF_BACKUP_LAST_ERROR); if(error != null) { status = r.getString(R.string.backup_status_failed); subtitle = r.getString(R.string.backup_status_failed_subtitle);