Loading res/layout/preferences_dialog.xml +8 −0 Original line number Original line Diff line number Diff line Loading @@ -28,6 +28,14 @@ android:layout_weight="1" /> android:layout_weight="1" /> </LinearLayout> </LinearLayout> <androidx.appcompat.widget.SwitchCompat android:id="@+id/preferences_all_updates" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/pref_all_updates" android:textSize="16sp" /> <androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat android:id="@+id/preferences_auto_delete_updates" android:id="@+id/preferences_auto_delete_updates" android:layout_width="match_parent" android:layout_width="match_parent" Loading res/values/e_strings.xml +1 −0 Original line number Original line Diff line number Diff line Loading @@ -36,4 +36,5 @@ <string name="e_header_title_text">/e/OS\n%1$s</string> <string name="e_header_title_text">/e/OS\n%1$s</string> <string name="e_available_updates">Available updates:</string> <string name="e_available_updates">Available updates:</string> <string name="e_current_version">Current version:</string> <string name="e_current_version">Current version:</string> <string name="pref_all_updates">See all available updates</string> </resources> </resources> No newline at end of file src/org/lineageos/updater/UpdatesActivity.java +3 −0 Original line number Original line Diff line number Diff line Loading @@ -485,6 +485,7 @@ public class UpdatesActivity extends UpdatesListActivity { Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval); Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval); SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates); SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates); SwitchCompat dataWarning = view.findViewById(R.id.preferences_mobile_data_warning); 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 abPerfMode = view.findViewById(R.id.preferences_ab_perf_mode); SwitchCompat updateRecovery = view.findViewById(R.id.preferences_update_recovery); SwitchCompat updateRecovery = view.findViewById(R.id.preferences_update_recovery); Loading Loading @@ -514,6 +515,7 @@ public class UpdatesActivity extends UpdatesListActivity { autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true)); autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true)); dataWarning.setChecked(prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, 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, abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, getResources().getBoolean(R.bool.config_prioritizeUpdateProcess))); getResources().getBoolean(R.bool.config_prioritizeUpdateProcess))); Loading Loading @@ -554,6 +556,7 @@ public class UpdatesActivity extends UpdatesListActivity { autoCheckInterval.getSelectedItemPosition()) autoCheckInterval.getSelectedItemPosition()) .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked()) .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked()) .putBoolean(Constants.PREF_MOBILE_DATA_WARNING, dataWarning.isChecked()) .putBoolean(Constants.PREF_MOBILE_DATA_WARNING, dataWarning.isChecked()) .putBoolean(Constants.PREF_ALL_UPDATES, allUpdates.isChecked()) .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked()) .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked()) .apply(); .apply(); Loading src/org/lineageos/updater/misc/Constants.java +1 −0 Original line number Original line Diff line number Diff line Loading @@ -34,6 +34,7 @@ public final class Constants { public static final String PREF_LAST_UPDATE_CHECK = "last_update_check"; 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_UPDATES_CHECK_INTERVAL = "auto_updates_check_interval"; public static final String PREF_AUTO_DELETE_UPDATES = "auto_delete_updates"; 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_AB_PERF_MODE = "ab_perf_mode"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id"; public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id"; Loading src/org/lineageos/updater/misc/Utils.java +9 −1 Original line number Original line Diff line number Diff line Loading @@ -269,8 +269,16 @@ public class Utils { serverUrl = context.getString(R.string.updater_server_url); 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()) { 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) return serverUrl.replace("{device}", device) Loading Loading
res/layout/preferences_dialog.xml +8 −0 Original line number Original line Diff line number Diff line Loading @@ -28,6 +28,14 @@ android:layout_weight="1" /> android:layout_weight="1" /> </LinearLayout> </LinearLayout> <androidx.appcompat.widget.SwitchCompat android:id="@+id/preferences_all_updates" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/pref_all_updates" android:textSize="16sp" /> <androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat android:id="@+id/preferences_auto_delete_updates" android:id="@+id/preferences_auto_delete_updates" android:layout_width="match_parent" android:layout_width="match_parent" Loading
res/values/e_strings.xml +1 −0 Original line number Original line Diff line number Diff line Loading @@ -36,4 +36,5 @@ <string name="e_header_title_text">/e/OS\n%1$s</string> <string name="e_header_title_text">/e/OS\n%1$s</string> <string name="e_available_updates">Available updates:</string> <string name="e_available_updates">Available updates:</string> <string name="e_current_version">Current version:</string> <string name="e_current_version">Current version:</string> <string name="pref_all_updates">See all available updates</string> </resources> </resources> No newline at end of file
src/org/lineageos/updater/UpdatesActivity.java +3 −0 Original line number Original line Diff line number Diff line Loading @@ -485,6 +485,7 @@ public class UpdatesActivity extends UpdatesListActivity { Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval); Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval); SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates); SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates); SwitchCompat dataWarning = view.findViewById(R.id.preferences_mobile_data_warning); 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 abPerfMode = view.findViewById(R.id.preferences_ab_perf_mode); SwitchCompat updateRecovery = view.findViewById(R.id.preferences_update_recovery); SwitchCompat updateRecovery = view.findViewById(R.id.preferences_update_recovery); Loading Loading @@ -514,6 +515,7 @@ public class UpdatesActivity extends UpdatesListActivity { autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true)); autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true)); dataWarning.setChecked(prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, 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, abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, getResources().getBoolean(R.bool.config_prioritizeUpdateProcess))); getResources().getBoolean(R.bool.config_prioritizeUpdateProcess))); Loading Loading @@ -554,6 +556,7 @@ public class UpdatesActivity extends UpdatesListActivity { autoCheckInterval.getSelectedItemPosition()) autoCheckInterval.getSelectedItemPosition()) .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked()) .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked()) .putBoolean(Constants.PREF_MOBILE_DATA_WARNING, dataWarning.isChecked()) .putBoolean(Constants.PREF_MOBILE_DATA_WARNING, dataWarning.isChecked()) .putBoolean(Constants.PREF_ALL_UPDATES, allUpdates.isChecked()) .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked()) .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked()) .apply(); .apply(); Loading
src/org/lineageos/updater/misc/Constants.java +1 −0 Original line number Original line Diff line number Diff line Loading @@ -34,6 +34,7 @@ public final class Constants { public static final String PREF_LAST_UPDATE_CHECK = "last_update_check"; 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_UPDATES_CHECK_INTERVAL = "auto_updates_check_interval"; public static final String PREF_AUTO_DELETE_UPDATES = "auto_delete_updates"; 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_AB_PERF_MODE = "ab_perf_mode"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id"; public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id"; Loading
src/org/lineageos/updater/misc/Utils.java +9 −1 Original line number Original line Diff line number Diff line Loading @@ -269,8 +269,16 @@ public class Utils { serverUrl = context.getString(R.string.updater_server_url); 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()) { 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) return serverUrl.replace("{device}", device) Loading