From 4331fa404717a2d3c9c4737e3dbca54150f1d395 Mon Sep 17 00:00:00 2001 From: Nico Alt Date: Sat, 22 Aug 2015 10:04:42 +0200 Subject: [PATCH] Revert "Prompt for beta updates" This reverts commit 92f8678b3d2da18ad93bac6af0ae83984cf74714. --- F-Droid/res/values/strings.xml | 2 -- F-Droid/res/xml/preferences.xml | 5 ----- F-Droid/src/org/fdroid/fdroid/FDroidApp.java | 8 -------- .../src/org/fdroid/fdroid/Preferences.java | 19 ------------------- .../org/fdroid/fdroid/data/AppProvider.java | 4 +--- 5 files changed, 1 insertion(+), 37 deletions(-) diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml index 5aca88566..f9a33b498 100644 --- a/F-Droid/res/values/strings.xml +++ b/F-Droid/res/values/strings.xml @@ -13,8 +13,6 @@ App cache Keep downloaded .apk files on device Updates - Get updates newer than suggested version - Beta updates Other Last repo scan: %s never diff --git a/F-Droid/res/xml/preferences.xml b/F-Droid/res/xml/preferences.xml index 839c0d41a..0de38fb22 100644 --- a/F-Droid/res/xml/preferences.xml +++ b/F-Droid/res/xml/preferences.xml @@ -78,11 +78,6 @@ - diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java index 45cce242a..ab607f37a 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java @@ -187,14 +187,6 @@ public class FDroidApp extends Application { } }); - final Context context = this; - Preferences.get().registerBetaUpdatesChangeListener(new Preferences.ChangeListener() { - @Override - public void onPreferenceChange() { - AppProvider.Helper.calcDetailsFromIndex(context); - } - }); - // Clear cached apk files. We used to just remove them after they'd // been installed, but this causes problems for proprietary gapps // users since the introduction of verification (on pre-4.2 Android), diff --git a/F-Droid/src/org/fdroid/fdroid/Preferences.java b/F-Droid/src/org/fdroid/fdroid/Preferences.java index 3e7027b84..fc8963c68 100644 --- a/F-Droid/src/org/fdroid/fdroid/Preferences.java +++ b/F-Droid/src/org/fdroid/fdroid/Preferences.java @@ -47,7 +47,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi public static final String PREF_COMPACT_LAYOUT = "compactlayout"; public static final String PREF_IGN_TOUCH = "ignoreTouchscreen"; public static final String PREF_CACHE_APK = "cacheDownloaded"; - public static final String PREF_BETA_UPDATES = "betaUpdates"; public static final String PREF_EXPERT = "expert"; public static final String PREF_UPD_LAST = "lastUpdateCheck"; public static final String PREF_SYSTEM_INSTALLER = "systemInstaller"; @@ -69,7 +68,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi private static final boolean DEFAULT_SYSTEM_INSTALLER = false; private static final boolean DEFAULT_LOCAL_REPO_BONJOUR = true; private static final boolean DEFAULT_CACHE_APK = false; - private static final boolean DEFAULT_BETA_UPDATES = false; private static final boolean DEFAULT_LOCAL_REPO_HTTPS = false; private static final boolean DEFAULT_INCOMP_VER = false; private static final boolean DEFAULT_EXPERT = false; @@ -92,7 +90,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi private final List localRepoBonjourListeners = new ArrayList<>(); private final List localRepoNameListeners = new ArrayList<>(); private final List localRepoHttpsListeners = new ArrayList<>(); - private final List betaUpdatesListeners = new ArrayList<>(); private boolean isInitialized(String key) { return initialized.containsKey(key) && initialized.get(key); @@ -138,10 +135,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi return preferences.getBoolean(PREF_CACHE_APK, DEFAULT_CACHE_APK); } - public boolean getBetaUpdates() { - return preferences.getBoolean(PREF_BETA_UPDATES, DEFAULT_BETA_UPDATES); - } - public boolean showIncompatibleVersions() { return preferences.getBoolean(PREF_INCOMP_VER, DEFAULT_INCOMP_VER); } @@ -248,14 +241,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi filterAppsRequiringRootListeners.remove(listener); } - public void registerBetaUpdatesChangeListener(ChangeListener listener) { - betaUpdatesListeners.add(listener); - } - - public void unregisterBetaUpdatesChangeListener(ChangeListener listener) { - betaUpdatesListeners.remove(listener); - } - @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { Utils.DebugLog(TAG, "Invalidating preference '" + key + "'."); @@ -291,10 +276,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi for (ChangeListener listener : localRepoHttpsListeners) { listener.onPreferenceChange(); } - case PREF_BETA_UPDATES: - for (ChangeListener listener : betaUpdatesListeners) { - listener.onPreferenceChange(); - } break; } } diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java index 2742da608..267e50c3a 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java @@ -851,8 +851,6 @@ public class AppProvider extends FDroidProvider { final String apk = DBHelper.TABLE_APK; final String app = DBHelper.TABLE_APP; - final boolean betaUpdates = Preferences.get().getBetaUpdates(); - String restrictToStable = betaUpdates ? "" : ( apk + ".vercode <= " + app + ".upstreamVercode AND " ); String updateSql = "UPDATE " + app + " SET suggestedVercode = ( " + @@ -860,7 +858,7 @@ public class AppProvider extends FDroidProvider { " FROM " + apk + " WHERE " + app + ".id = " + apk + ".id AND " + - restrictToStable + + apk + ".vercode <= " + app + ".upstreamVercode AND " + " ( " + app + ".compatible = 0 OR " + apk + ".compatible = 1 ) ) " + " WHERE upstreamVercode > 0 ";