From 9500c987cc8edca7cb766a3ebbee43d3ed11e28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 16 Jan 2014 09:32:34 +0100 Subject: [PATCH] Finish getting rid of hard-coded preferences --- src/org/fdroid/fdroid/AppDetails.java | 6 +++--- src/org/fdroid/fdroid/AppFilter.java | 2 +- src/org/fdroid/fdroid/AppListManager.java | 2 +- src/org/fdroid/fdroid/FDroidApp.java | 6 +++--- src/org/fdroid/fdroid/ManageRepo.java | 2 +- src/org/fdroid/fdroid/Preferences.java | 1 + src/org/fdroid/fdroid/UpdateService.java | 13 +++++++------ 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java index 70d739a15..82058207a 100644 --- a/src/org/fdroid/fdroid/AppDetails.java +++ b/src/org/fdroid/fdroid/AppDetails.java @@ -327,9 +327,9 @@ public class AppDetails extends ListActivity { SharedPreferences prefs = PreferenceManager .getDefaultSharedPreferences(getBaseContext()); - pref_smallDensity = prefs.getBoolean("smallDensity", false); - pref_expert = prefs.getBoolean("expert", false); - pref_permissions = prefs.getBoolean("showPermissions", false); + pref_smallDensity = prefs.getBoolean(Preferences.PREF_SMALL_DENSITY, false); + pref_expert = prefs.getBoolean(Preferences.PREF_EXPERT, false); + pref_permissions = prefs.getBoolean(Preferences.PREF_PERMISSIONS, false); pref_incompatibleVersions = prefs.getBoolean( Preferences.PREF_INCOMP_VER, false); diff --git a/src/org/fdroid/fdroid/AppFilter.java b/src/org/fdroid/fdroid/AppFilter.java index 6cd688d7e..9e85f8eae 100644 --- a/src/org/fdroid/fdroid/AppFilter.java +++ b/src/org/fdroid/fdroid/AppFilter.java @@ -31,7 +31,7 @@ public class AppFilter { // Read preferences and cache them so we can do quick lookups. SharedPreferences prefs = PreferenceManager .getDefaultSharedPreferences(ctx); - pref_rooted = prefs.getBoolean("rooted", true); + pref_rooted = prefs.getBoolean(Preferences.PREF_ROOTED, true); } // Return true if the given app should be filtered out based on user diff --git a/src/org/fdroid/fdroid/AppListManager.java b/src/org/fdroid/fdroid/AppListManager.java index 8e30ee7c1..ee66e5736 100644 --- a/src/org/fdroid/fdroid/AppListManager.java +++ b/src/org/fdroid/fdroid/AppListManager.java @@ -143,7 +143,7 @@ public class AppListManager { private Date calcMaxHistory() { SharedPreferences prefs = PreferenceManager .getDefaultSharedPreferences(fdroidActivity.getBaseContext()); - String daysPreference = prefs.getString("updateHistoryDays", "14"); + String daysPreference = prefs.getString(Preferences.PREF_UPD_HISTORY, "14"); int maxHistoryDays = Integer.parseInt(daysPreference); Calendar recent = Calendar.getInstance(); recent.add(Calendar.DAY_OF_YEAR, -maxHistoryDays); diff --git a/src/org/fdroid/fdroid/FDroidApp.java b/src/org/fdroid/fdroid/FDroidApp.java index 54d48bb1e..cd4e0179b 100644 --- a/src/org/fdroid/fdroid/FDroidApp.java +++ b/src/org/fdroid/fdroid/FDroidApp.java @@ -68,7 +68,7 @@ public class FDroidApp extends Application { public void reloadTheme() { curTheme = Theme.valueOf(PreferenceManager .getDefaultSharedPreferences(getBaseContext()) - .getString("theme", "dark")); + .getString(Preferences.PREF_THEME, "dark")); } public void applyTheme(Activity activity) { switch (curTheme) { @@ -96,8 +96,8 @@ public class FDroidApp extends Application { // because the install intent says it's finished when it hasn't. SharedPreferences prefs = PreferenceManager .getDefaultSharedPreferences(getBaseContext()); - curTheme = Theme.valueOf(prefs.getString("theme", "dark")); - if (!prefs.getBoolean("cacheDownloaded", false)) { + curTheme = Theme.valueOf(prefs.getString(Preferences.PREF_THEME, "dark")); + if (!prefs.getBoolean(Preferences.PREF_CACHE_APK, false)) { File local_path = Utils.getApkCacheDir(this); // Things can be null if the SD card is not ready - we'll just diff --git a/src/org/fdroid/fdroid/ManageRepo.java b/src/org/fdroid/fdroid/ManageRepo.java index ab06b5e20..50191ff71 100644 --- a/src/org/fdroid/fdroid/ManageRepo.java +++ b/src/org/fdroid/fdroid/ManageRepo.java @@ -92,7 +92,7 @@ public class ManageRepo extends ListActivity { .getDefaultSharedPreferences(getBaseContext()); TextView tv_lastCheck = (TextView)findViewById(R.id.lastUpdateCheck); - long lastUpdate = prefs.getLong("lastUpdateCheck", 0); + long lastUpdate = prefs.getLong(Preferences.PREF_UPD_LAST, 0); String s_lastUpdateCheck = ""; if (lastUpdate == 0) { s_lastUpdateCheck = getString(R.string.never); diff --git a/src/org/fdroid/fdroid/Preferences.java b/src/org/fdroid/fdroid/Preferences.java index 052dbe4e6..825e3d526 100644 --- a/src/org/fdroid/fdroid/Preferences.java +++ b/src/org/fdroid/fdroid/Preferences.java @@ -40,6 +40,7 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi public static final String PREF_CACHE_APK = "cacheDownloaded"; public static final String PREF_EXPERT = "expert"; public static final String PREF_DB_SYNC = "dbSyncMode"; + public static final String PREF_UPD_LAST = "lastUpdateCheck"; private static final boolean DEFAULT_COMPACT_LAYOUT = false; private static final boolean DEFAULT_SMALL_DENSITY = false; diff --git a/src/org/fdroid/fdroid/UpdateService.java b/src/org/fdroid/fdroid/UpdateService.java index 6c5f30b92..d81b2fddd 100644 --- a/src/org/fdroid/fdroid/UpdateService.java +++ b/src/org/fdroid/fdroid/UpdateService.java @@ -42,6 +42,7 @@ public class UpdateService extends IntentService implements ProgressListener { public static final String RESULT_MESSAGE = "msg"; public static final String RESULT_EVENT = "event"; + public static final int STATUS_COMPLETE_WITH_CHANGES = 0; public static final int STATUS_COMPLETE_AND_SAME = 1; public static final int STATUS_ERROR = 2; @@ -130,7 +131,7 @@ public class UpdateService extends IntentService implements ProgressListener { SharedPreferences prefs = PreferenceManager .getDefaultSharedPreferences(ctx); - String sint = prefs.getString("updateInterval", "0"); + String sint = prefs.getString(Preferences.PREF_UPD_INTERVAL, "0"); int interval = Integer.parseInt(sint); Intent intent = new Intent(ctx, UpdateService.class); @@ -203,8 +204,8 @@ public class UpdateService extends IntentService implements ProgressListener { // See if it's time to actually do anything yet... if (isScheduledRun()) { - long lastUpdate = prefs.getLong("lastUpdateCheck", 0); - String sint = prefs.getString("updateInterval", "0"); + long lastUpdate = prefs.getLong(Preferences.PREF_UPD_LAST, 0); + String sint = prefs.getString(Preferences.PREF_UPD_INTERVAL, "0"); int interval = Integer.parseInt(sint); if (interval == 0) { Log.d("FDroid", "Skipping update - disabled"); @@ -219,7 +220,7 @@ public class UpdateService extends IntentService implements ProgressListener { // If we are to update the repos only on wifi, make sure that // connection is active - if (prefs.getBoolean("updateOnWifiOnly", false)) { + if (prefs.getBoolean(Preferences.PREF_UPD_WIFI_ONLY, false)) { ConnectivityManager conMan = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo.State wifi = conMan.getNetworkInfo(1).getState(); if (wifi != NetworkInfo.State.CONNECTED && @@ -232,7 +233,7 @@ public class UpdateService extends IntentService implements ProgressListener { Log.d("FDroid", "Unscheduled (manually requested) update"); } - boolean notify = prefs.getBoolean("updateNotify", false); + boolean notify = prefs.getBoolean(Preferences.PREF_UPD_NOTIFY, false); // Grab some preliminary information, then we can release the // database while we do all the downloading, etc... @@ -385,7 +386,7 @@ public class UpdateService extends IntentService implements ProgressListener { sendStatus(STATUS_ERROR, errmsg); } else { Editor e = prefs.edit(); - e.putLong("lastUpdateCheck", System.currentTimeMillis()); + e.putLong(Preferences.PREF_UPD_LAST, System.currentTimeMillis()); e.commit(); if (changes) { sendStatus(STATUS_COMPLETE_WITH_CHANGES);