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

Unverified Commit dde7fdde authored by Michael Bestas's avatar Michael Bestas Committed by Michael Bestas
Browse files

BatteryTip: Hide Learn more button if URL is empty 

When help_url_battery_defender is empty, tapping on Learn more button
causes a NPE.

Issue: calyxos#2809
Change-Id: Ib1c52dcff430cae7c4bc0793120ace837f5bf4c7
parent 39c502cc

src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java

+25 −19
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ public class BatteryDefenderTip extends BatteryTip { 
        }



        cardPreference.setSelectable(false);

        if (getHelpResource() != 0) {

            cardPreference.setNegativeButtonText(

                    Utils.createAccessibleSequence(

                            context.getString(R.string.learn_more),
@@ -101,7 +102,7 @@ public class BatteryDefenderTip extends BatteryTip { 
                        var helpIntent =

                                HelpUtils.getHelpIntent(

                                        context,

                                    context.getString(R.string.help_url_battery_defender),

                                        context.getString(getHelpResource()),

                                        /* backupContext= */ "");

                        ActivityCompat.startActivityForResult(

                                (Activity) preference.getContext(),
@@ -110,6 +111,7 @@ public class BatteryDefenderTip extends BatteryTip { 
                                /* options= */ null);

                    });

            cardPreference.setNegativeButtonVisible(true);

        }



        cardPreference.setPositiveButtonText(

                context.getString(R.string.battery_tip_charge_to_full_button));
@@ -121,6 +123,10 @@ public class BatteryDefenderTip extends BatteryTip { 
        cardPreference.setPositiveButtonVisible(mIsPluggedIn);

    }



    private int getHelpResource() {

        return R.string.help_url_battery_defender;

    }



    private void resumeCharging(Context context) {

        final Intent intent =

                FeatureFactory.getFeatureFactory()