Fix possible timer duplicates.

Change-Id: I070e36c4a82ca245a641e53466cdaf10dd01e95c

1 files changed, 20 insertions, 11 deletions

diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Timer.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Timer.java
index 4e13910ef6ad..937ccc533a69 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/Timer.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Timer.java
@@ -45,24 +45,41 @@ public class Timer implements Runnable {
         return mTotalMinutes != 0;
     }
 
+    public int getMinutesLeft() {
+        return mTotalMinutes - mPassedMinutes;
+    }
+
+    public boolean isTimeUp() {
+        return getMinutesLeft() <= 0;
+    }
+
     public void start() {
         if (!isSet()) {
             return;
         }
 
+        tearDownTimerHandler();
+        setUpTimerHandler();
+    }
+
+    private void tearDownTimerHandler() {
+        mTimerHandler.removeCallbacks(this);
+    }
+
+    private void setUpTimerHandler() {
         mTimerHandler.postDelayed(this, TimeUnit.MINUTES.toMillis(UPDATE_PERIOD_IN_MINUTES));
     }
 
     @Override
     public void run() {
-        updatePassedMinutes();
+        increasePassedMinutes();
 
         mTimerListener.onTimerUpdated();
 
         start();
     }
 
-    private void updatePassedMinutes() {
+    private void increasePassedMinutes() {
         mPassedMinutes++;
     }
 
@@ -72,7 +89,7 @@ public class Timer implements Runnable {
     }
 
     public void pause() {
-        mTimerHandler.removeCallbacks(this);
+        tearDownTimerHandler();
     }
 
     public void reset() {
@@ -83,14 +100,6 @@ public class Timer implements Runnable {
     public void resume() {
         start();
     }
-
-    public boolean isTimeUp() {
-        return getMinutesLeft() <= 0;
-    }
-
-    public int getMinutesLeft() {
-        return mTotalMinutes - mPassedMinutes;
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */