Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename Preferences constants to be readable, Java style

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-04-19 16:56:30 +02:00
parent 16d15a358d
commit 40635c36e5
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/fdroid/fdroid/Preferences.java
View File

@ -41,10 +41,10 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
} }
} }
public static final String PREF_UPD_INTERVAL = "updateInterval"; public static final String PREF_UPDATE_INTERVAL = "updateInterval";
public static final String PREF_UPD_WIFI_ONLY = "updateOnWifiOnly"; public static final String PREF_UPDATE_ON_WIFI_ONLY = "updateOnWifiOnly";
public static final String PREF_AUTO_DOWNLOAD_INSTALL_UPDATES = "updateAutoDownload"; public static final String PREF_AUTO_DOWNLOAD_INSTALL_UPDATES = "updateAutoDownload";
public static final String PREF_UPD_NOTIFY = "updateNotify"; public static final String PREF_UPDATE_NOTIFICATION_ENABLED = "updateNotify";
public static final String PREF_THEME = "theme"; public static final String PREF_THEME = "theme";
public static final String PREF_SHOW_INCOMPAT_VERSIONS = "incompatibleVersions"; public static final String PREF_SHOW_INCOMPAT_VERSIONS = "incompatibleVersions";
public static final String PREF_SHOW_ROOT_APPS = "rooted"; public static final String PREF_SHOW_ROOT_APPS = "rooted";
@ -75,7 +75,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
private static final boolean DEFAULT_SHOW_INCOMPAT_VERSIONS = false; private static final boolean DEFAULT_SHOW_INCOMPAT_VERSIONS = false;
private static final boolean DEFAULT_SHOW_ROOT_APPS = true; private static final boolean DEFAULT_SHOW_ROOT_APPS = true;
private static final boolean DEFAULT_SHOW_ANTI_FEATURE_APPS = true; private static final boolean DEFAULT_SHOW_ANTI_FEATURE_APPS = true;
private static final int DEFAULT_UPD_INTERVAL = 24; private static final int DEFAULT_UPDATE_INTERVAL = 24;
private static final boolean DEFAULT_PRIVILEGED_INSTALLER = true; private static final boolean DEFAULT_PRIVILEGED_INSTALLER = true;
//private static final boolean DEFAULT_LOCAL_REPO_BONJOUR = true; //private static final boolean DEFAULT_LOCAL_REPO_BONJOUR = true;
private static final long DEFAULT_KEEP_CACHE_TIME = TimeUnit.DAYS.toMillis(1); private static final long DEFAULT_KEEP_CACHE_TIME = TimeUnit.DAYS.toMillis(1);
@ -164,11 +164,11 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
public int getUpdateInterval() { public int getUpdateInterval() {
int hours; int hours;
try { try {
String value = preferences.getString(PREF_UPD_INTERVAL, String value = preferences.getString(PREF_UPDATE_INTERVAL,
String.valueOf(DEFAULT_UPD_INTERVAL)); String.valueOf(DEFAULT_UPDATE_INTERVAL));
hours = Integer.parseInt(value); hours = Integer.parseInt(value);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
hours = DEFAULT_UPD_INTERVAL; hours = DEFAULT_UPDATE_INTERVAL;
} }
return hours * 60 * 60 * 1000; return hours * 60 * 60 * 1000;
} }
@ -283,7 +283,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
} }
public boolean isUpdateNotificationEnabled() { public boolean isUpdateNotificationEnabled() {
return preferences.getBoolean(PREF_UPD_NOTIFY, true); return preferences.getBoolean(PREF_UPDATE_NOTIFICATION_ENABLED, true);
} }
public boolean isAutoDownloadEnabled() { public boolean isAutoDownloadEnabled() {
@ -297,7 +297,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
public boolean isBackgroundDownloadAllowed() { public boolean isBackgroundDownloadAllowed() {
return FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT || return FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT ||
(FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED
&& !preferences.getBoolean(PREF_UPD_WIFI_ONLY, false)); && !preferences.getBoolean(PREF_UPDATE_ON_WIFI_ONLY, false));
} }
/** /**

16
app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -31,9 +31,9 @@ public class PreferencesFragment extends PreferenceFragment
implements SharedPreferences.OnSharedPreferenceChangeListener { implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String[] SUMMARIES_TO_UPDATE = { private static final String[] SUMMARIES_TO_UPDATE = {
Preferences.PREF_UPD_INTERVAL, Preferences.PREF_UPDATE_INTERVAL,
Preferences.PREF_UPD_WIFI_ONLY, Preferences.PREF_UPDATE_ON_WIFI_ONLY,
Preferences.PREF_UPD_NOTIFY, Preferences.PREF_UPDATE_NOTIFICATION_ENABLED,
Preferences.PREF_SHOW_ROOT_APPS, Preferences.PREF_SHOW_ROOT_APPS,
Preferences.PREF_SHOW_ANTI_FEATURE_APPS, Preferences.PREF_SHOW_ANTI_FEATURE_APPS,
Preferences.PREF_SHOW_INCOMPAT_VERSIONS, Preferences.PREF_SHOW_INCOMPAT_VERSIONS,
@ -97,12 +97,12 @@ public class PreferencesFragment extends PreferenceFragment
private void updateSummary(String key, boolean changing) { private void updateSummary(String key, boolean changing) {
switch (key) { switch (key) {
case Preferences.PREF_UPD_INTERVAL: case Preferences.PREF_UPDATE_INTERVAL:
ListPreference listPref = (ListPreference) findPreference( ListPreference listPref = (ListPreference) findPreference(
Preferences.PREF_UPD_INTERVAL); Preferences.PREF_UPDATE_INTERVAL);
int interval = Integer.parseInt(listPref.getValue()); int interval = Integer.parseInt(listPref.getValue());
Preference onlyOnWifi = findPreference( Preference onlyOnWifi = findPreference(
Preferences.PREF_UPD_WIFI_ONLY); Preferences.PREF_UPDATE_ON_WIFI_ONLY);
onlyOnWifi.setEnabled(interval > 0); onlyOnWifi.setEnabled(interval > 0);
if (interval == 0) { if (interval == 0) {
listPref.setSummary(R.string.update_interval_zero); listPref.setSummary(R.string.update_interval_zero);
@ -111,11 +111,11 @@ public class PreferencesFragment extends PreferenceFragment
} }
break; break;
case Preferences.PREF_UPD_WIFI_ONLY: case Preferences.PREF_UPDATE_ON_WIFI_ONLY:
checkSummary(key, R.string.automatic_scan_wifi_on); checkSummary(key, R.string.automatic_scan_wifi_on);
break; break;
case Preferences.PREF_UPD_NOTIFY: case Preferences.PREF_UPDATE_NOTIFICATION_ENABLED:
checkSummary(key, R.string.notify_on); checkSummary(key, R.string.notify_on);
break; break;