Refactors Android plugin alongside the embedding V2 migration

Author: ened

android/src/main/java/com/cloudwebrtc/webrtc/DataChannelObserver.java

@@ -1,96 +1,94 @@
 package com.cloudwebrtc.webrtc;
 
-import java.nio.charset.Charset;
-import android.util.Base64;
-
-import org.webrtc.DataChannel;
-import io.flutter.plugin.common.EventChannel;
 import com.cloudwebrtc.webrtc.utils.AnyThreadSink;
 import com.cloudwebrtc.webrtc.utils.ConstraintsMap;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugin.common.EventChannel;
+import java.nio.charset.Charset;
+import org.webrtc.DataChannel;
 
 class DataChannelObserver implements DataChannel.Observer, EventChannel.StreamHandler {
-    private final int mId;
-    private final DataChannel mDataChannel;
-    private final String peerConnectionId;
-    private final FlutterWebRTCPlugin plugin;
-    private EventChannel eventChannel;
-    private EventChannel.EventSink eventSink;
 
-    DataChannelObserver(FlutterWebRTCPlugin plugin, String peerConnectionId, int id, DataChannel dataChannel) {
-        this.peerConnectionId = peerConnectionId;
-        mId = id;
-        mDataChannel = dataChannel;
-        this.plugin = plugin;
-        this.eventChannel =
-                new EventChannel(
-                        plugin.registrar().messenger(),
-                        "FlutterWebRTC/dataChannelEvent" + peerConnectionId + String.valueOf(id));
-        eventChannel.setStreamHandler(this);
-    }
+  private final int mId;
+  private final DataChannel mDataChannel;
 
-    private String dataChannelStateString(DataChannel.State dataChannelState) {
-        switch (dataChannelState) {
-            case CONNECTING:
-                return "connecting";
-            case OPEN:
-                return "open";
-            case CLOSING:
-                return "closing";
-            case CLOSED:
-                return "closed";
-        }
-        return "";
-    }
+  private EventChannel eventChannel;
+  private EventChannel.EventSink eventSink;
 
-    @Override
-    public void onListen(Object o, EventChannel.EventSink sink) {
-        eventSink = new AnyThreadSink(sink);
-    }
+  DataChannelObserver(BinaryMessenger messenger, String peerConnectionId, int id,
+      DataChannel dataChannel) {
+    mId = id;
+    mDataChannel = dataChannel;
+    eventChannel =
+        new EventChannel(messenger, "FlutterWebRTC/dataChannelEvent" + peerConnectionId + id);
+    eventChannel.setStreamHandler(this);
+  }
 
-    @Override
-    public void onCancel(Object o) {
-        eventSink = null;
+  private String dataChannelStateString(DataChannel.State dataChannelState) {
+    switch (dataChannelState) {
+      case CONNECTING:
+        return "connecting";
+      case OPEN:
+        return "open";
+      case CLOSING:
+        return "closing";
+      case CLOSED:
+        return "closed";
     }
+    return "";
+  }
 
-    @Override
-    public void onBufferedAmountChange(long amount) { }
+  @Override
+  public void onListen(Object o, EventChannel.EventSink sink) {
+    eventSink = new AnyThreadSink(sink);
+  }
 
-    @Override
-    public void onStateChange() {
-        ConstraintsMap params = new ConstraintsMap();
-        params.putString("event", "dataChannelStateChanged");
-        params.putInt("id", mDataChannel.id());
-        params.putString("state", dataChannelStateString(mDataChannel.state()));
-        sendEvent(params);
-    }
+  @Override
+  public void onCancel(Object o) {
+    eventSink = null;
+  }
 
-    @Override
-    public void onMessage(DataChannel.Buffer buffer) {
-        ConstraintsMap params = new ConstraintsMap();
-        params.putString("event", "dataChannelReceiveMessage");
-        params.putInt("id", mDataChannel.id());
+  @Override
+  public void onBufferedAmountChange(long amount) {
+  }
 
-        byte[] bytes;
-        if (buffer.data.hasArray()) {
-            bytes = buffer.data.array();
-        } else {
-            bytes = new byte[buffer.data.remaining()];
-            buffer.data.get(bytes);
-        }
+  @Override
+  public void onStateChange() {
+    ConstraintsMap params = new ConstraintsMap();
+    params.putString("event", "dataChannelStateChanged");
+    params.putInt("id", mDataChannel.id());
+    params.putString("state", dataChannelStateString(mDataChannel.state()));
+    sendEvent(params);
+  }
 
-        if (buffer.binary) {
-            params.putString("type", "binary");
-            params.putByte("data", bytes);
-        } else {
-            params.putString("type", "text");
-            params.putString("data", new String(bytes, Charset.forName("UTF-8")));
-        }
+  @Override
+  public void onMessage(DataChannel.Buffer buffer) {
+    ConstraintsMap params = new ConstraintsMap();
+    params.putString("event", "dataChannelReceiveMessage");
+    params.putInt("id", mDataChannel.id());
 
-        sendEvent(params);
+    byte[] bytes;
+    if (buffer.data.hasArray()) {
+      bytes = buffer.data.array();
+    } else {
+      bytes = new byte[buffer.data.remaining()];
+      buffer.data.get(bytes);
     }
 
-    void sendEvent(ConstraintsMap params) {
-        if(eventSink != null)
-            eventSink.success(params.toMap());
+    if (buffer.binary) {
+      params.putString("type", "binary");
+      params.putByte("data", bytes);
+    } else {
+      params.putString("type", "text");
+      params.putString("data", new String(bytes, Charset.forName("UTF-8")));
+    }
+
+    sendEvent(params);
+  }
+
+  private void sendEvent(ConstraintsMap params) {
+    if (eventSink != null) {
+      eventSink.success(params.toMap());
     }
+  }
 }