Use own keep alive executor for background timer

Author: nonelse

Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java

@@ -601,6 +601,15 @@ public void run() {
         });
     }
 
+    public void backgroundTimerFired() {
+        scheduledExecutor.submit(new Runnable() {
+            @Override
+            public void run() {
+                backgroundTimerFiredI();
+            }
+        });
+    }
+
     public String getAdid() {
         if (activityState == null) {
             return null;
@@ -702,10 +711,10 @@ public void run() {
         if (adjustConfig.sendInBackground) {
             logger.info("Send in background configured");
 
-            backgroundTimer = new TimerOnce(scheduledExecutor, new Runnable() {
+            backgroundTimer = new TimerOnce(new Runnable() {
                 @Override
                 public void run() {
-                    backgroundTimerFiredI();
+                    backgroundTimerFired();
                 }
             }, BACKGROUND_TIMER_NAME);
         }
@@ -717,10 +726,10 @@ public void run() {
         {
             logger.info("Delay start configured");
             internalState.delayStart = true;
-            delayStartTimer = new TimerOnce(scheduledExecutor, new Runnable() {
+            delayStartTimer = new TimerOnce(new Runnable() {
                 @Override
                 public void run() {
-                    sendFirstPackagesI();
+                    sendFirstPackages();
                 }
             }, DELAY_START_TIMER_NAME);
         }

Adjust/adjust/src/main/java/com/adjust/sdk/AttributionHandler.java

@@ -50,10 +50,10 @@ public AttributionHandler(IActivityHandler activityHandler,
         scheduledExecutor = new CustomScheduledExecutor("AttributionHandler", false);
         logger = AdjustFactory.getLogger();
 
-        timer = new TimerOnce(scheduledExecutor, new Runnable() {
+        timer = new TimerOnce(new Runnable() {
             @Override
             public void run() {
-                sendAttributionRequestI();
+                sendAttributionRequest();
             }
         }, ATTRIBUTION_TIMER_NAME);
 
@@ -117,6 +117,15 @@ public void resumeSending() {
         paused = false;
     }
 
+    public void sendAttributionRequest() {
+        scheduledExecutor.submit(new Runnable() {
+            @Override
+            public void run() {
+                sendAttributionRequestI();
+            }
+        });
+    }
+
     private void getAttributionI(long delayInMilliseconds) {
         // don't reset if new time is shorter than last one
         if (timer.getFireIn() > delayInMilliseconds) {

Adjust/adjust/src/main/java/com/adjust/sdk/TimerOnce.java

@@ -8,15 +8,16 @@
  * Created by pfms on 08/05/15.
  */
 public class TimerOnce {
-    private WeakReference<CustomScheduledExecutor> scheduledExecutorWeakRef;
+    private CustomScheduledExecutor executor;
+
     private ScheduledFuture waitingTask;
     private String name;
     private Runnable command;
     private ILogger logger;
 
-    public TimerOnce(CustomScheduledExecutor scheduler, Runnable command, String name) {
+    public TimerOnce(Runnable command, String name) {
         this.name = name;
-        this.scheduledExecutorWeakRef = new WeakReference<CustomScheduledExecutor>(scheduler);
+        this.executor = new CustomScheduledExecutor(name, true);
         this.command = command;
         this.logger = AdjustFactory.getLogger();
     }
@@ -25,16 +26,11 @@ public void startIn(long fireIn) {
         // cancel previous
         cancel(false);
 
-        CustomScheduledExecutor scheduledExecutor = scheduledExecutorWeakRef.get();
-        if (scheduledExecutor == null) {
-            return;
-        }
-
         String fireInSeconds = Util.SecondsDisplayFormat.format(fireIn / 1000.0);
 
         logger.verbose("%s starting. Launching in %s seconds", name, fireInSeconds);
 
-        waitingTask = scheduledExecutor.schedule(new Runnable() {
+        waitingTask = executor.schedule(new Runnable() {
             @Override
             public void run() {
                 logger.verbose("%s fired", name);
@@ -66,9 +62,7 @@ public void cancel() {
 
     public void teardown() {
         cancel(true);
-        if (scheduledExecutorWeakRef != null) {
-            scheduledExecutorWeakRef.clear();
-        }
-        scheduledExecutorWeakRef = null;
+
+        executor = null;
     }
 }

Adjust/example/src/main/java/com/adjust/examples/MainActivity.java

@@ -10,7 +10,8 @@
 import android.widget.Button;
 import android.widget.Toast;
 
-import com.adjust.sdk.*;
+import com.adjust.sdk.Adjust;
+import com.adjust.sdk.AdjustEvent;
 
 public class MainActivity extends AppCompatActivity {
     private static final String EVENT_TOKEN_SIMPLE      = "g3mfiw";