Ensure all handlers are run on main thread

terrabythia · Jun 23, 2019 · 40d5e21 · 40d5e21
1 parent b502459
commit 40d5e21
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/DiscoveryRunningHandler.java b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/DiscoveryRunningHandler.java
@@ -12,8 +12,8 @@ public class DiscoveryRunningHandler implements EventChannel.StreamHandler {
 
     public DiscoveryRunningHandler(){
         this.handler = new Handler(Looper.getMainLooper());
-
     }
+
     @Override
     public void onListen(Object o, EventChannel.EventSink eventSink) {
         sink = eventSink;

diff --git a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceDiscoveredHandler.java b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceDiscoveredHandler.java
@@ -1,12 +1,21 @@
 package eu.sndr.fluttermdnsplugin.handlers;
 
+import android.os.Handler;
+import android.os.Looper;
+
 import java.util.Map;
 
 import io.flutter.plugin.common.EventChannel;
 
 public class ServiceDiscoveredHandler implements EventChannel.StreamHandler {
 
+    private Handler handler;
     EventChannel.EventSink sink;
+
+    public ServiceDiscoveredHandler(){
+        this.handler = new Handler(Looper.getMainLooper());
+    }
+
     @Override
     public void onListen(Object o, EventChannel.EventSink eventSink) {
         sink = eventSink;
@@ -18,6 +27,6 @@ public void onCancel(Object o) {
     }
 
     public void onServiceDiscovered(Map<String, Object> serviceInfoMap){
-        sink.success(serviceInfoMap);
+        handler.post(() -> sink.success(serviceInfoMap));
     }
 }
diff --git a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceLostHandler.java b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceLostHandler.java
@@ -1,12 +1,21 @@
 package eu.sndr.fluttermdnsplugin.handlers;
 
+import android.os.Handler;
+import android.os.Looper;
+
 import java.util.Map;
 
 import io.flutter.plugin.common.EventChannel;
 
 public class ServiceLostHandler implements EventChannel.StreamHandler {
 
+    private Handler handler;
     EventChannel.EventSink sink;
+
+    public ServiceLostHandler(){
+        this.handler = new Handler(Looper.getMainLooper());
+    }
+
     @Override
     public void onListen(Object o, EventChannel.EventSink eventSink) {
         sink = eventSink;
@@ -18,6 +27,6 @@ public void onCancel(Object o) {
     }
 
     public void onServiceLost(Map<String, Object> serviceInfoMap){
-        sink.success(serviceInfoMap);
+        handler.post(() -> sink.success(serviceInfoMap));
     }
 }
diff --git a/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceResolvedHandler.java b/android/src/main/java/eu/sndr/fluttermdnsplugin/handlers/ServiceResolvedHandler.java
@@ -1,12 +1,21 @@
 package eu.sndr.fluttermdnsplugin.handlers;
 
+import android.os.Handler;
+import android.os.Looper;
+
 import java.util.Map;
 
 import io.flutter.plugin.common.EventChannel;
 
 public class ServiceResolvedHandler implements EventChannel.StreamHandler {
 
+    private Handler handler;
     EventChannel.EventSink sink;
+
+    public ServiceResolvedHandler(){
+        this.handler = new Handler(Looper.getMainLooper());
+    }
+
     @Override
     public void onListen(Object o, EventChannel.EventSink eventSink) {
         sink = eventSink;
@@ -18,7 +27,7 @@ public void onCancel(Object o) {
     }
 
     public void onServiceResolved(Map<String, Object> serviceInfoMap) {
-        sink.success(serviceInfoMap);
+        handler.post(() -> sink.success(serviceInfoMap));
     }
 
 }