Merge pull request #361 from Countly/timer_refactor

Make timer only start once and shutdown it for tests

Author: turtledreams

sdk/src/main/java/ly/count/android/sdk/Countly.java

@@ -142,7 +142,7 @@ private static class SingletonHolder {
     }
 
     ConnectionQueue connectionQueue_;
-    private final ScheduledExecutorService timerService_;
+    private ScheduledExecutorService timerService_;
     private ScheduledFuture<?> timerFuture = null;
     private int activityCount_;
     boolean disableUpdateSessionRequests_ = false;//todo, move to module after 'setDisableUpdateSessionRequests' is removed
@@ -241,13 +241,8 @@ public static Countly sharedInstance() {
      * Creates a new ConnectionQueue and initializes the session timer.
      */
     Countly() {
-        timerService_ = Executors.newSingleThreadScheduledExecutor();
-        staticInit();
-    }
-
-    private void staticInit() {
         connectionQueue_ = new ConnectionQueue();
-        startTimerService(timerService_, timerFuture, TIMER_DELAY_IN_SECONDS);
+        timerService_ = Executors.newSingleThreadScheduledExecutor();
     }
 
     private void startTimerService(ScheduledExecutorService service, ScheduledFuture<?> previousTimer, long timerDelay) {
@@ -260,12 +255,7 @@ private void startTimerService(ScheduledExecutorService service, ScheduledFuture
             timerDelay = 1;
         }
 
-        timerFuture = service.scheduleWithFixedDelay(new Runnable() {
-            @Override
-            public void run() {
-                onTimer();
-            }
-        }, timerDelay, timerDelay, TimeUnit.SECONDS);
+        timerFuture = service.scheduleWithFixedDelay(this::onTimer, timerDelay, timerDelay, TimeUnit.SECONDS);
     }
 
     /**
@@ -427,11 +417,13 @@ public synchronized Countly init(CountlyConfig config) {
                 config.sdkInternalLimits.maxStackTraceLineLength = maxStackTraceLineLengthDefault;
             }
 
+            long timerDelay = TIMER_DELAY_IN_SECONDS;
             if (config.sessionUpdateTimerDelay != null) {
                 //if we need to change the timer delay, do that first
                 L.d("[Init] Setting custom session update timer delay, [" + config.sessionUpdateTimerDelay + "]");
-                startTimerService(timerService_, timerFuture, config.sessionUpdateTimerDelay);
+                timerDelay = config.sessionUpdateTimerDelay;
             }
+            startTimerService(timerService_, timerFuture, timerDelay);
 
             if (config.explicitStorageModeEnabled) {
                 L.i("[Init] Explicit storage mode is being enabled");
@@ -832,17 +824,34 @@ boolean lifecycleStateAtLeastStartedInternal() {
         return ProcessLifecycleOwner.get().getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED);
     }
 
+    private void stopTimer() {
+        L.i("[Countly] stopTimer, Stopping global timer");
+        if (timerService_ != null) {
+            try {
+                timerService_.shutdown();
+                if (!timerService_.awaitTermination(1, TimeUnit.SECONDS)) {
+                    timerService_.shutdownNow();
+                    if (!timerService_.awaitTermination(1, TimeUnit.SECONDS)) {
+                        L.e("[Countly] stopTimer, Global timer must be locked");
+                    }
+                }
+            } catch (Throwable t) {
+                L.e("[Countly] stopTimer, Error while stopping global timer " + t);
+            }
+        }
+    }
+
     /**
-     * Immediately disables session &amp; event tracking and clears any stored session &amp; event data.
-     * This API is useful if your app has a tracking opt-out switch, and you want to immediately
-     * disable tracking when a user opts out.
+     * Immediately disables session and event tracking and clears any stored session and event data.
+     * Testing Purposes Only!
      *
      * This will destroy all stored data
      */
     public synchronized void halt() {
         L.i("Halting Countly!");
         sdkIsInitialised = false;
         L.SetListener(null);
+        stopTimer();
 
         if (connectionQueue_ != null) {
             if (countlyStore != null) {
@@ -877,7 +886,8 @@ public synchronized void halt() {
         COUNTLY_SDK_VERSION_STRING = DEFAULT_COUNTLY_SDK_VERSION_STRING;
         COUNTLY_SDK_NAME = DEFAULT_COUNTLY_SDK_NAME;
 
-        staticInit();
+        connectionQueue_ = new ConnectionQueue();
+        timerService_ = Executors.newSingleThreadScheduledExecutor();
     }
 
     synchronized void notifyDeviceIdChange(boolean withoutMerge) {