From 08b53d7ce0febc72f1213132d3e43c66bfa2ea14 Mon Sep 17 00:00:00 2001
From: "Rohit R. Abbadi" <rohit@flackon.com>
Date: Fri, 24 Jul 2020 12:27:43 +0530
Subject: [PATCH] Android: encoding of Gson element handled

---
 .../ably/flutter/plugin/AblyMessageCodec.java | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java b/android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java
index 0464b7fd0..ab172be73 100644
--- a/android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java
+++ b/android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java
@@ -1,11 +1,14 @@
 package io.ably.flutter.plugin;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
 import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Array;
 import java.nio.ByteBuffer;
-import java.util.Date;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -118,9 +121,21 @@ protected void writeValue(ByteArrayOutputStream stream, Object value) {
                 return;
             }
         }
+        if(value instanceof JsonElement){
+            WriteJsonElement(stream, (JsonElement) value);
+            return;
+        }
         super.writeValue(stream, value);
     }
 
+    private void WriteJsonElement(ByteArrayOutputStream stream, JsonElement value){
+        if(value instanceof JsonObject){
+            super.writeValue(stream, (new Gson()).fromJson(value, Map.class));
+        } else if(value instanceof JsonArray){
+            super.writeValue(stream, (new Gson()).fromJson(value, ArrayList.class));
+        }
+    }
+
     /**
      * Dart int types get delivered to Java as Integer, unless '32 bits not enough' in which case
      * they are delivered as Long.
@@ -270,15 +285,8 @@ private Map<String, Object> encodeChannelMessage(Message c){
         writeValueToJson(jsonMap, PlatformConstants.TxMessage.id, c.id);
         writeValueToJson(jsonMap, PlatformConstants.TxMessage.clientId, c.clientId);
         writeValueToJson(jsonMap, PlatformConstants.TxMessage.connectionId, c.connectionId);
-        writeValueToJson(jsonMap, PlatformConstants.TxMessage.timestamp, new Date(c.timestamp));
+        writeValueToJson(jsonMap, PlatformConstants.TxMessage.timestamp, c.timestamp);
         writeValueToJson(jsonMap, PlatformConstants.TxMessage.name, c.name);
-        System.out.println("MESAAGE DATA FROM ANDROID");
-        System.out.println(c.data);
-        System.out.println(c.data instanceof Number);
-        System.out.println(c.data instanceof String);
-        System.out.println(c.data instanceof Array);
-        System.out.println(c.data instanceof List);
-        System.out.println(c.data instanceof Map);
         writeValueToJson(jsonMap, PlatformConstants.TxMessage.data, c.data);
         writeValueToJson(jsonMap, PlatformConstants.TxMessage.encoding, c.encoding);
         writeValueToJson(jsonMap, PlatformConstants.TxMessage.extras, c.extras);