Dev: replace Timer with Handler in embedded version

andriydruk · Jan 30, 2019 · 147b292 · 147b292
1 parent aecc21a
commit 147b292
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -58,19 +58,19 @@ Embedded version:
 My dnssd library:
 
 ```groovy
-compile 'com.github.andriydruk:dnssd:0.9.12'
+compile 'com.github.andriydruk:dnssd:0.9.13'
 ```
 
 My rxdnssd library:
 
 ```groovy
-compile 'com.github.andriydruk:rxdnssd:0.9.12'
+compile 'com.github.andriydruk:rxdnssd:0.9.13'
 ```
 
 My rx2dnssd library:
 
 ```
-compile 'com.github.andriydruk:rx2dnssd:0.9.12'
+compile 'com.github.andriydruk:rx2dnssd:0.9.13'
 ```
 
 * It's built with Andorid NDK r18b for all platforms (1.7 MB). If you prefer another NDK version or subset of platforms, please build it from source with command:

diff --git a/app/src/main/java/com/github/druk/dnssdsamples/MainActivity.java b/app/src/main/java/com/github/druk/dnssdsamples/MainActivity.java
@@ -3,6 +3,7 @@
 import com.github.druk.rx2dnssd.BonjourService;
 import com.github.druk.rx2dnssd.Rx2Dnssd;
 import com.github.druk.rx2dnssd.Rx2DnssdBindable;
+import com.github.druk.rx2dnssd.Rx2DnssdEmbedded;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -39,7 +40,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        rxDnssd = new Rx2DnssdBindable(this);
+        rxDnssd = new Rx2DnssdEmbedded(this);
 
         findViewById(R.id.check_threads).setOnClickListener(v -> {
             /*

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong
@@ -43,7 +43,7 @@ ext {
     bintrayConfigurations = ['archives']
 
     bintrayGroup = 'com.github.andriydruk'
-    bintrayVersion = '0.9.12'
+    bintrayVersion = '0.9.13'
 
     bintrayLibraryDescription = 'Android version of Apple DNSSD Java API'
 

diff --git a/dnssd/src/main/java/com/github/druk/dnssd/DNSSDEmbedded.java b/dnssd/src/main/java/com/github/druk/dnssd/DNSSDEmbedded.java
@@ -17,11 +17,10 @@
 package com.github.druk.dnssd;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 
-import java.util.Timer;
-import java.util.TimerTask;
-
 /**
  * RxDnssd is implementation of RxDnssd with embedded DNS-SD  {@link InternalDNSSD}
  */
@@ -31,7 +30,7 @@ public class DNSSDEmbedded extends DNSSD {
 
     private static final String TAG = "DNSSDEmbedded";
     private final long mStopTimerDelay;
-    private Timer mStopTimer;
+    private final Handler handler = new Handler(Looper.getMainLooper());
     private Thread mThread;
     private volatile boolean isStarted = false;
     private int serviceCount = 0;
@@ -58,12 +57,10 @@ public DNSSDEmbedded(Context context, long stopTimerDelay) {
      * Note: This method will block thread until DNS-SD initialization finish.
      */
     public void init() {
-        if (mStopTimer != null) {
-            mStopTimer.cancel();
-            mStopTimer.purge();
-        }
+        handler.removeCallbacks(DNSSDEmbedded::nativeExit);
 
         if (mThread != null && mThread.isAlive()) {
+            Log.i(TAG, "already started");
             waitUntilStarted();
             return;
         }
@@ -90,7 +87,7 @@ public void run() {
             }
         };
         mThread.setPriority(Thread.MAX_PRIORITY);
-        mThread.setName("DNS-SD");
+        mThread.setName("DNS-SDEmbedded");
         mThread.start();
 
         waitUntilStarted();
@@ -103,18 +100,11 @@ public void run() {
      */
     public void exit() {
         synchronized (DNSSDEmbedded.class) {
-            mStopTimer = new Timer();
-            mStopTimer.schedule(exitTask, mStopTimerDelay);
+            Log.i(TAG, "post exit");
+            handler.postDelayed(DNSSDEmbedded::nativeExit, mStopTimerDelay);
         }
     }
 
-    private static final TimerTask exitTask = new TimerTask() {
-        @Override
-        public void run() {
-            nativeExit();
-        }
-    };
-
     private void waitUntilStarted() {
         synchronized (DNSSDEmbedded.class) {
             while (!isStarted) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip