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

Commit 5c95a4e8 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '2241-t-fast_update' into 'v2.4-t' 

Updater: Change preference to reset default value

See merge request !202
parents 720073fb 2ecc0cfc

app/src/main/java/org/lineageos/updater/UpdatesActivity.java

+1 −6
Original line number Diff line number Diff line
@@ -617,12 +617,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport 
        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,

                getResources().getBoolean(R.bool.config_prioritizeUpdateProcess)));



        if (Utils.isPrefDevices()) {

            abPerfMode.setChecked(true);

            abPerfMode.setEnabled(false);

        }

                Utils.defaultABPerfMode(this)));



        if (getResources().getBoolean(R.bool.config_hideRecoveryUpdate)) {

            // Hide the update feature if explicitly requested.

app/src/main/java/org/lineageos/updater/controller/ABUpdateInstaller.java

+2 −2
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ class ABUpdateInstaller { 
        }



        boolean enableABPerfMode = PreferenceManager.getDefaultSharedPreferences(mContext)

                .getBoolean(Constants.PREF_AB_PERF_MODE, false);

        mUpdateEngine.setPerformanceMode(enableABPerfMode || Utils.isPrefDevices());

                .getBoolean(Constants.PREF_AB_PERF_MODE, Utils.defaultABPerfMode(mContext));

        mUpdateEngine.setPerformanceMode(enableABPerfMode);



        String zipFileUri = "file://" + file.getAbsolutePath();

        try {

app/src/main/java/org/lineageos/updater/misc/Constants.java

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ public final class Constants { 
    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_AB_PERF_MODE_OLD = "ab_perf_mode";

    public static final String PREF_AB_PERF_MODE = "e_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";

    public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id";

app/src/main/java/org/lineageos/updater/misc/Utils.java

+5 −4
Original line number Diff line number Diff line
@@ -531,10 +531,11 @@ public class Utils { 
        return isAB;

    }



    public static boolean isPrefDevices() {

        String manufacturer = Build.MANUFACTURER.toLowerCase(Locale.ROOT);

        String device = Build.DEVICE.toLowerCase(Locale.ROOT);

        return manufacturer.equals("fairphone") && (device.equals("fp4") || device.equals("fp5"));

    public static boolean defaultABPerfMode(Context context) {

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        boolean oldPrefValue = prefs.getBoolean(Constants.PREF_AB_PERF_MODE_OLD, false);

        return (context.getResources().getBoolean(R.bool.config_prioritizeUpdateProcess)

                || oldPrefValue);

    }



    public static boolean isDevModeOn(Context context) {