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

Commit f40eb1de authored by Isaac Katzenelson's avatar Isaac Katzenelson
Browse files

Reset timers data instead of deleting it 

Bug: 7561736
Change-Id: I5039f53fb946e884dcedb772a367b1e1c509f647
parent 45a2e4b9

src/com/android/deskclock/AlarmInitReceiver.java

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ public class AlarmInitReceiver extends BroadcastReceiver { 
                    // Clear stopwatch and timers data

                    SharedPreferences prefs =

                            PreferenceManager.getDefaultSharedPreferences(context);

                    Log.v("AlarmInitReceiver - Cleaning old timer and stopwatch data");

                    TimerObj.cleanTimersFromSharedPrefs(prefs);

                    Log.v("AlarmInitReceiver - Reset timers and clear stopwatch data");

                    TimerObj.resetTimersInSharedPrefs(prefs);

                    Utils.clearSwSharedPref(prefs);

                }

                Alarms.setNextAlert(context);

src/com/android/deskclock/timer/TimerObj.java

+5 −2
Original line number Diff line number Diff line
@@ -265,12 +265,15 @@ public class TimerObj implements Parcelable { 
        }

    }



    public static void cleanTimersFromSharedPrefs(SharedPreferences prefs) {

    public static void resetTimersInSharedPrefs(SharedPreferences prefs) {

        ArrayList<TimerObj> timers = new  ArrayList<TimerObj>();

        getTimersFromSharedPrefs(prefs, timers);

        Iterator<TimerObj> i = timers.iterator();

        while(i.hasNext()) {

            i.next().deleteFromSharedPref(prefs);

            TimerObj t = i.next();

            t.mState = TimerObj.STATE_RESTART;

            t.mTimeLeft = t. mOriginalLength = t.mSetupLength;

            t.writeToSharedPref(prefs);

        }

    }