Removed base64 type on android.

cloudwebrtc · cloudwebrtc · commit 66bbef7ac092 · 2019-05-16T14:01:21.000+08:00
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/DataChannelObserver.java b/android/src/main/java/com/cloudwebrtc/webrtc/DataChannelObserver.java
@@ -79,7 +79,7 @@ public void onMessage(DataChannel.Buffer buffer) {
 
         if (buffer.binary) {
             params.putString("type", "binary");
-            params.putString("data", Base64.encodeToString(bytes, Base64.NO_WRAP));
+            params.putByte("data", bytes);
         } else {
             params.putString("type", "text");
             params.putString("data", new String(bytes, Charset.forName("UTF-8")));
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java b/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java
@@ -14,6 +14,7 @@
 import com.cloudwebrtc.webrtc.utils.EglUtils;
 import com.cloudwebrtc.webrtc.utils.ObjectType;
 
+import java.io.UnsupportedEncodingException;
 import java.io.File;
 import java.nio.ByteBuffer;
 import java.util.*;
@@ -209,8 +210,21 @@ public void onMethodCall(MethodCall call, Result result) {
             String peerConnectionId = call.argument("peerConnectionId");
             int dataChannelId = call.argument("dataChannelId");
             String type = call.argument("type");
-            ByteBuffer byteBuffer = ByteBuffer.wrap(call.argument("data"));
-            dataChannelSend(peerConnectionId, dataChannelId, byteBuffer, type.equals("binary"));
+            Boolean isBinary = type.equals("binary");
+            ByteBuffer byteBuffer;
+            if(isBinary){
+                byteBuffer = ByteBuffer.wrap(call.argument("data"));
+            }else{
+                try {
+                    String data = call.argument("data");
+                    byteBuffer = ByteBuffer.wrap(data.getBytes("UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    Log.d(TAG, "Could not encode text string as UTF-8.");
+                    result.error("dataChannelSendFailed", "Could not encode text string as UTF-8.",null);
+                    return;
+                }
+            }
+            dataChannelSend(peerConnectionId, dataChannelId, byteBuffer, isBinary);
             result.success(null);
         } else if (call.method.equals("dataChannelClose")) {
             String peerConnectionId = call.argument("peerConnectionId");
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/utils/ConstraintsArray.java b/android/src/main/java/com/cloudwebrtc/webrtc/utils/ConstraintsArray.java
@@ -39,6 +39,10 @@ public String getString(int index){
         return (String) mArray.get(index);
     }
 
+    public Byte[] getByte(int index){
+        return (Byte[]) mArray.get(index);
+    }
+
     public ConstraintsArray getArray(int index){
         return new ConstraintsArray((ArrayList<Object>)mArray.get(index));
     }
@@ -64,6 +68,8 @@ public ObjectType getType(int index) {
             return ObjectType.Array;
         } else if (object instanceof Map) {
             return ObjectType.Map;
+        } else if (object instanceof Byte) {
+            return ObjectType.Byte;
         }
         return ObjectType.Null;
     }
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/utils/ConstraintsMap.java b/android/src/main/java/com/cloudwebrtc/webrtc/utils/ConstraintsMap.java
@@ -65,6 +65,8 @@ public ObjectType getType(String name) {
             return ObjectType.Map;
         } else if (value instanceof ArrayList) {
             return ObjectType.Array;
+        } else if (value instanceof Byte) {
+            return ObjectType.Byte;
         } else {
             throw new IllegalArgumentException("Invalid value " + value.toString() + " for key " + name +
                     "contained in ConstraintsMap");
@@ -87,6 +89,10 @@ public void putString(String key, String value) {
         mMap.put(key, value);
     }
 
+    public void putByte(String key, byte[] value) {
+        mMap.put(key, value);
+    }
+
     public void putNull(String key) {
         mMap.put(key, null);
     }
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/utils/ObjectType.java b/android/src/main/java/com/cloudwebrtc/webrtc/utils/ObjectType.java
@@ -7,4 +7,5 @@ public enum ObjectType {
     String,
     Map,
     Array,
+    Byte
 }
diff --git a/lib/rtc_data_channel.dart b/lib/rtc_data_channel.dart
@@ -178,19 +178,12 @@ class RTCDataChannel {
   /// To send a binary message, pass a binary [RTCDataChannelMessage]
   /// constructed with [RTCDataChannelMessage.fromBinary]
   Future<void> send(RTCDataChannelMessage message) async {
-    dynamic data;
-    if (message.isBinary) {
-      data = message.binary;
-    }
-    else {
-      data = message.text;
-    }
     await _channel.invokeMethod('dataChannelSend',
       <String, dynamic>{
         'peerConnectionId': _peerConnectionId,
         'dataChannelId': _dataChannelId,
         'type': message.isBinary ? "binary" : "text",
-        'data': data
+        'data': message.isBinary?  message.binary : message.text,
       }
     );
   }

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ public String getString(int index){`
`39`	`39`	`return (String) mArray.get(index);`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ public Byte[] getByte(int index){`
	`43`	`+ return (Byte[]) mArray.get(index);`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`public ConstraintsArray getArray(int index){`
`43`	`47`	`return new ConstraintsArray((ArrayList<Object>)mArray.get(index));`
`44`	`48`	`}`
`@@ -64,6 +68,8 @@ public ObjectType getType(int index) {`
`64`	`68`	`return ObjectType.Array;`
`65`	`69`	`} else if (object instanceof Map) {`
`66`	`70`	`return ObjectType.Map;`
	`71`	`+ } else if (object instanceof Byte) {`
	`72`	`+ return ObjectType.Byte;`
`67`	`73`	`}`
`68`	`74`	`return ObjectType.Null;`
`69`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,5 @@ public enum ObjectType {`
`7`	`7`	`String,`
`8`	`8`	`Map,`
`9`	`9`	`Array,`
	`10`	`+ Byte`
`10`	`11`	`}`