From a294bcc2d6b74429923d43a43568ff03e9aa1438 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 17 May 2024 15:25:25 +0530 Subject: [PATCH] Updater: add option to show all updates --- res/layout/preferences_dialog.xml | 8 ++++++++ res/values/e_strings.xml | 1 + src/org/lineageos/updater/UpdatesActivity.java | 3 +++ src/org/lineageos/updater/misc/Constants.java | 1 + src/org/lineageos/updater/misc/Utils.java | 10 +++++++++- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/res/layout/preferences_dialog.xml b/res/layout/preferences_dialog.xml index 2537dccb..170e2d9b 100644 --- a/res/layout/preferences_dialog.xml +++ b/res/layout/preferences_dialog.xml @@ -28,6 +28,14 @@ android:layout_weight="1" /> + + /e/OS\n%1$s Available updates: Current version: + See all available updates \ No newline at end of file diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index 34d65a35..75074bda 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -485,6 +485,7 @@ public class UpdatesActivity extends UpdatesListActivity { Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval); SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates); SwitchCompat dataWarning = view.findViewById(R.id.preferences_mobile_data_warning); + SwitchCompat allUpdates = view.findViewById(R.id.preferences_all_updates); SwitchCompat abPerfMode = view.findViewById(R.id.preferences_ab_perf_mode); SwitchCompat updateRecovery = view.findViewById(R.id.preferences_update_recovery); @@ -514,6 +515,7 @@ public class UpdatesActivity extends UpdatesListActivity { autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true)); dataWarning.setChecked(prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true)); + allUpdates.setChecked(prefs.getBoolean(Constants.PREF_ALL_UPDATES, false)); abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, getResources().getBoolean(R.bool.config_prioritizeUpdateProcess))); @@ -554,6 +556,7 @@ public class UpdatesActivity extends UpdatesListActivity { autoCheckInterval.getSelectedItemPosition()) .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked()) .putBoolean(Constants.PREF_MOBILE_DATA_WARNING, dataWarning.isChecked()) + .putBoolean(Constants.PREF_ALL_UPDATES, allUpdates.isChecked()) .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked()) .apply(); diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java index a083dce8..13ed1901 100644 --- a/src/org/lineageos/updater/misc/Constants.java +++ b/src/org/lineageos/updater/misc/Constants.java @@ -34,6 +34,7 @@ public final class Constants { public static final String PREF_LAST_UPDATE_CHECK = "last_update_check"; public static final String PREF_AUTO_UPDATES_CHECK_INTERVAL = "auto_updates_check_interval"; public static final String PREF_AUTO_DELETE_UPDATES = "auto_delete_updates"; + public static final String PREF_ALL_UPDATES = "all_updates"; public static final String PREF_AB_PERF_MODE = "ab_perf_mode"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id"; diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java index d3994c63..5dc759f9 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -269,8 +269,16 @@ public class Utils { serverUrl = context.getString(R.string.updater_server_url); } + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); + boolean allUpdates = preferences.getBoolean(Constants.PREF_ALL_UPDATES, false); + if (Utils.isDevModeOn(context)) { + allUpdates = true; + } + if (anonHash != null && !anonHash.isEmpty()) { - serverUrl += "?ota_anon_hash=" + anonHash; + serverUrl += "?ota_anon_hash=" + anonHash + "&strict=" + !allUpdates; + } else { + serverUrl += "?strict=" + !allUpdates; } return serverUrl.replace("{device}", device) -- GitLab