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

Commit bc5858f4 authored by John Spurlock's avatar John Spurlock
Browse files

Zen: Be more defensive against old time conditions.

Bug:16192570
Change-Id: If5097174fac89c5d809271241645d1efca92476e
parent ca249dc6
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -215,10 +215,12 @@ public class ZenModePanel extends LinearLayout {
    }

    private void refreshExitConditionText() {
        final String forever = mContext.getString(R.string.zen_mode_forever);
        if (mExitConditionId == null) {
            mExitConditionText = mContext.getString(R.string.zen_mode_forever);
            mExitConditionText = forever;
        } else if (ZenModeConfig.isValidCountdownConditionId(mExitConditionId)) {
            mExitConditionText = parseExistingTimeCondition(mExitConditionId).summary;
            final Condition condition = parseExistingTimeCondition(mExitConditionId);
            mExitConditionText = condition != null ? condition.summary : forever;
        } else {
            mExitConditionText = "(until condition ends)";  // TODO persist current description
        }