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

Merge branch 'betaUpdates' into 'master'

Browse Source 
Prompt for beta updates

Ready to get merged. 👍

~~This MR is ready to get merged, the last thing that needs to be fixed is [this](72ed814a73 (note_1726274)).~~

This closes #313.

See merge request !112
This commit is contained in:
Daniel Martí 2015-08-09 18:33:09 +00:00
commit 9cafe80763
5 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/res/values/strings.xml
View File

@ -13,6 +13,8 @@
<string name="cache_downloaded">App cache</string>
<string name="cache_downloaded_on">Keep downloaded .apk files on device</string>
<string name="updates">Updates</string>
<string name="updates_summary">Get updates newer than suggested version</string>
<string name="beta_updates">Beta updates</string>
<string name="other">Other</string>
<string name="last_update_check">Last repo scan: %s</string>
<string name="never">never</string>

5
F-Droid/res/xml/preferences.xml
View File

@ -78,6 +78,11 @@
<CheckBoxPreference android:title="@string/cache_downloaded"
android:defaultValue="false"
android:key="cacheDownloaded" />
<CheckBoxPreference
android:key="betaUpdates"
android:title="@string/beta_updates"
android:summary="@string/updates_summary"
android:defaultValue="false" />
<CheckBoxPreference android:title="@string/expert"
android:defaultValue="false"
android:key="expert" />

8
F-Droid/src/org/fdroid/fdroid/FDroidApp.java
View File

@ -183,6 +183,14 @@ 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),

19
F-Droid/src/org/fdroid/fdroid/Preferences.java
View File

@ -47,6 +47,7 @@ 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";
@ -68,6 +69,7 @@ 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;
@ -90,6 +92,7 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
private final List<ChangeListener> localRepoBonjourListeners = new ArrayList<>();
private final List<ChangeListener> localRepoNameListeners = new ArrayList<>();
private final List<ChangeListener> localRepoHttpsListeners = new ArrayList<>();
private final List<ChangeListener> betaUpdatesListeners = new ArrayList<>();
private boolean isInitialized(String key) {
return initialized.containsKey(key) && initialized.get(key);
@ -135,6 +138,10 @@ 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);
}
@ -241,6 +248,14 @@ 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) {
if (BuildConfig.DEBUG) {
@ -278,6 +293,10 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
for (ChangeListener listener : localRepoHttpsListeners) {
listener.onPreferenceChange();
}
case PREF_BETA_UPDATES:
for (ChangeListener listener : betaUpdatesListeners) {
listener.onPreferenceChange();
}
break;
}
}

4
F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
View File

@ -851,6 +851,8 @@ 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 = ( " +
@ -858,7 +860,7 @@ public class AppProvider extends FDroidProvider {
" FROM " + apk +
" WHERE " +
app + ".id = " + apk + ".id AND " +
apk + ".vercode <= " + app + ".upstreamVercode AND " +
restrictToStable +
" ( " + app + ".compatible = 0 OR " + apk + ".compatible = 1 ) ) " +
" WHERE upstreamVercode > 0 ";