Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eefac43f authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊 Committed by Nishith Khanna
Browse files

Updater: add option to show all updates

parent 32cde170
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
        View view = LayoutInflater.from(this).inflate(R.layout.preferences_dialog, null);
        Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval);
        SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates);
        SwitchCompat allUpdates = view.findViewById(R.id.preferences_all_updates);
        SwitchCompat meteredNetworkWarning = view.findViewById(
                R.id.preferences_metered_network_warning);
        SwitchCompat abPerfMode = view.findViewById(R.id.preferences_ab_perf_mode);
@@ -624,6 +625,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
        autoCheckInterval.setSelection(Utils.getUpdateCheckSetting(this));

        autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true));
        allUpdates.setChecked(prefs.getBoolean(Constants.PREF_ALL_UPDATES, false));
        meteredNetworkWarning.setChecked(prefs.getBoolean(Constants.PREF_METERED_NETWORK_WARNING,
                prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true)));
        abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE,
@@ -665,6 +667,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
                            .putInt(Constants.PREF_AUTO_UPDATES_CHECK_INTERVAL,
                                    autoCheckInterval.getSelectedItemPosition())
                            .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked())
                            .putBoolean(Constants.PREF_ALL_UPDATES, allUpdates.isChecked())
                            .putBoolean(Constants.PREF_METERED_NETWORK_WARNING,
                                    meteredNetworkWarning.isChecked())
                            .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked())
+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,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_METERED_NETWORK_WARNING = "pref_metered_network_warning";
    public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
+7 −1
Original line number Diff line number Diff line
@@ -258,8 +258,14 @@ public class Utils {
            serverUrl = context.getString(R.string.e_updater_server_url);
        }

        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
        boolean showAllUpdates = preferences.getBoolean(Constants.PREF_ALL_UPDATES, false)
                || isDevModeOn(context);

        if (anonHash != null && !anonHash.isEmpty()) {
            serverUrl += "?ota_anon_hash=" + anonHash;
            serverUrl += "?ota_anon_hash=" + anonHash + "&strict=" + !showAllUpdates;
        } else {
            serverUrl += "?strict=" + !showAllUpdates;
        }

        return serverUrl.replace("{device}", device)
+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,14 @@
            android:layout_weight="1" />
    </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/e_pref_all_updates"
        android:textSize="16sp" />

    <androidx.appcompat.widget.SwitchCompat
        android:id="@+id/preferences_auto_delete_updates"
        android:layout_width="match_parent"
+1 −0
Original line number Diff line number Diff line
@@ -39,4 +39,5 @@
    <string name="e_header_title_text">/e/OS\n%1$s</string>
    <string name="e_available_updates">Available updates:</string>
    <string name="e_current_version">Current version:</string>
    <string name="e_pref_all_updates">See all available updates</string>
</resources>