REST - Channels & publishing messages

android/src/main/java/io/ably/flutter/plugin/AblyEventStreamHandler.java

@@ -141,53 +141,42 @@ public void onListen(Object object, EventChannel.EventSink uiThreadEventSink) {
     final String eventName = eventMessage.eventName;
     final Map<String, Object> eventPayload = (eventMessage.message == null) ? null : (Map<String, Object>) eventMessage.message;
     try {
-      ChannelOptions channelOptions;
       switch (eventName) {
         case PlatformConstants.PlatformMethod.onRealtimeConnectionStateChanged:
           connectionStateListener = new PluginConnectionStateListener(eventSink);
           ablyLibrary.getRealtime(ablyMessage.handle).connection.on(connectionStateListener);
           break;
         case PlatformConstants.PlatformMethod.onRealtimeChannelStateChanged:
           assert eventPayload != null : "event message is missing";
-          try {
-            final Channel channel = ablyLibrary
+          channelStateListener = new PluginChannelStateListener(eventSink);
+          ablyLibrary
               .getRealtime(ablyMessage.handle)
               .channels
-              .get(
-                (String) eventPayload.get("channel"),
-                (ChannelOptions) eventPayload.get("options")
-              );
-            channelStateListener = new PluginChannelStateListener(eventSink);
-            channel.on(channelStateListener);
-          } catch (AblyException ablyException) {
-            handleAblyException(eventSink, ablyException);
-          }
+              .get((String) eventPayload.get(PlatformConstants.TxTransportKeys.channelName))
+              .on(channelStateListener);
           break;
         case PlatformConstants.PlatformMethod.onRealtimeChannelMessage:
           assert eventPayload != null : "event message is missing";
           try {
-            final Channel channel = ablyLibrary
-              .getRealtime(ablyMessage.handle)
-              .channels
-              .get(
-                (String) eventPayload.get("channel"),
-                (ChannelOptions) eventPayload.get("options")
-              );
             channelMessageListener = new PluginChannelMessageListener(eventSink);
-            channel.subscribe(channelMessageListener);
+            ablyLibrary
+                .getRealtime(ablyMessage.handle)
+                .channels
+                .get((String) eventPayload.get(PlatformConstants.TxTransportKeys.channelName))
+                .subscribe(channelMessageListener);
           } catch (AblyException ablyException) {
             handleAblyException(eventSink, ablyException);
           }
           break;
         case PlatformConstants.PlatformMethod.onRealtimePresenceMessage:
           assert eventPayload != null : "event message is missing";
           try {
-            final Channel channel = ablyLibrary
-              .getRealtime(ablyMessage.handle)
-              .channels
-              .get((String) eventPayload.get(PlatformConstants.TxTransportKeys.channelName));
             channelPresenceMessageListener = new PluginChannelPresenceMessageListener(eventSink);
-            channel.presence.subscribe(channelPresenceMessageListener);
+            ablyLibrary
+                .getRealtime(ablyMessage.handle)
+                .channels
+                .get((String) eventPayload.get(PlatformConstants.TxTransportKeys.channelName))
+                .presence.subscribe(channelPresenceMessageListener);
           } catch (AblyException ablyException) {
             handleAblyException(eventSink, ablyException);
           }
@@ -219,27 +208,27 @@ public void onCancel(Object object) {
         // left as is as there is no way of propagating this error to flutter side
         assert eventPayload != null : "event message is missing";
         ablyLibrary
-          .getRealtime(ablyMessage.handle)
-          .channels
-          .get((String) eventPayload.get("channel"))
-          .off(channelStateListener);
+            .getRealtime(ablyMessage.handle)
+            .channels
+            .get((String) eventPayload.get(PlatformConstants.TxTransportKeys.channelName))
+            .off(channelStateListener);
         break;
       case PlatformConstants.PlatformMethod.onRealtimeChannelMessage:
         assert eventPayload != null : "event message is missing";
         ablyLibrary
-          .getRealtime(ablyMessage.handle)
-          .channels
-          .get((String) eventPayload.get("channel"))
-          .unsubscribe(channelMessageListener);
+            .getRealtime(ablyMessage.handle)
+            .channels
+            .get((String) eventPayload.get(PlatformConstants.TxTransportKeys.channelName))
+            .unsubscribe(channelMessageListener);
         break;
       case PlatformConstants.PlatformMethod.onRealtimePresenceMessage:
         assert eventPayload != null : "event message is missing";
         ablyLibrary
-          .getRealtime(ablyMessage.handle)
-          .channels
-          .get((String) eventPayload.get(PlatformConstants.TxTransportKeys.channelName))
-          .presence
-          .unsubscribe(channelPresenceMessageListener);
+            .getRealtime(ablyMessage.handle)
+            .channels
+            .get((String) eventPayload.get(PlatformConstants.TxTransportKeys.channelName))
+            .presence
+            .unsubscribe(channelPresenceMessageListener);
         break;
     }
   }

android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java

@@ -22,7 +22,9 @@
 import io.ably.lib.realtime.ConnectionStateListener;
 import io.ably.lib.rest.Auth;
 import io.ably.lib.rest.Auth.TokenDetails;
+import io.ably.lib.types.AblyException;
 import io.ably.lib.types.AsyncPaginatedResult;
+import io.ably.lib.types.ChannelOptions;
 import io.ably.lib.types.ClientOptions;
 import io.ably.lib.types.ErrorInfo;
 import io.ably.lib.types.Message;
@@ -74,39 +76,43 @@ T decode(Map<String, Object> jsonMap) {
     codecMap = new HashMap<Byte, CodecPair>() {
       {
         put(PlatformConstants.CodecTypes.ablyMessage,
-          new CodecPair<>(self::encodeAblyFlutterMessage, self::decodeAblyFlutterMessage));
+            new CodecPair<>(self::encodeAblyFlutterMessage, self::decodeAblyFlutterMessage));
         put(PlatformConstants.CodecTypes.ablyEventMessage,
-          new CodecPair<>(null, self::decodeAblyFlutterEventMessage));
+            new CodecPair<>(null, self::decodeAblyFlutterEventMessage));
         put(PlatformConstants.CodecTypes.clientOptions,
-          new CodecPair<>(null, self::decodeClientOptions));
+            new CodecPair<>(null, self::decodeClientOptions));
         put(PlatformConstants.CodecTypes.tokenParams,
-          new CodecPair<>(self::encodeTokenParams, null));
+            new CodecPair<>(self::encodeTokenParams, null));
         put(PlatformConstants.CodecTypes.tokenDetails,
-          new CodecPair<>(null, self::decodeTokenDetails));
+            new CodecPair<>(null, self::decodeTokenDetails));
         put(PlatformConstants.CodecTypes.tokenRequest,
-          new CodecPair<>(null, self::decodeTokenRequest));
+            new CodecPair<>(null, self::decodeTokenRequest));
+        put(PlatformConstants.CodecTypes.restChannelOptions,
+            new CodecPair<>(null, self::decodeRestChannelOptions));
+        put(PlatformConstants.CodecTypes.realtimeChannelOptions,
+            new CodecPair<>(null, self::decodeRealtimeChannelOptions));
         put(PlatformConstants.CodecTypes.paginatedResult,
-          new CodecPair<>(self::encodePaginatedResult, null));
+            new CodecPair<>(self::encodePaginatedResult, null));
         put(PlatformConstants.CodecTypes.restHistoryParams,
-          new CodecPair<>(null, self::decodeRestHistoryParams));
+            new CodecPair<>(null, self::decodeRestHistoryParams));
         put(PlatformConstants.CodecTypes.realtimeHistoryParams,
-          new CodecPair<>(null, self::decodeRealtimeHistoryParams));
+            new CodecPair<>(null, self::decodeRealtimeHistoryParams));
         put(PlatformConstants.CodecTypes.restPresenceParams,
-          new CodecPair<>(null, self::decodeRestPresenceParams));
+            new CodecPair<>(null, self::decodeRestPresenceParams));
         put(PlatformConstants.CodecTypes.realtimePresenceParams,
-          new CodecPair<>(null, self::decodeRealtimePresenceParams));
+            new CodecPair<>(null, self::decodeRealtimePresenceParams));
         put(PlatformConstants.CodecTypes.errorInfo,
-          new CodecPair<>(self::encodeErrorInfo, null));
+            new CodecPair<>(self::encodeErrorInfo, null));
         put(PlatformConstants.CodecTypes.messageData,
-          new CodecPair<>(null, self::decodeChannelMessageData));
+            new CodecPair<>(null, self::decodeChannelMessageData));
         put(PlatformConstants.CodecTypes.message,
-          new CodecPair<>(self::encodeChannelMessage, self::decodeChannelMessage));
+            new CodecPair<>(self::encodeChannelMessage, self::decodeChannelMessage));
         put(PlatformConstants.CodecTypes.presenceMessage,
-          new CodecPair<>(self::encodePresenceMessage, null));
+            new CodecPair<>(self::encodePresenceMessage, null));
         put(PlatformConstants.CodecTypes.connectionStateChange,
-          new CodecPair<>(self::encodeConnectionStateChange, null));
+            new CodecPair<>(self::encodeConnectionStateChange, null));
         put(PlatformConstants.CodecTypes.channelStateChange,
-          new CodecPair<>(self::encodeChannelStateChange, null));
+            new CodecPair<>(self::encodeChannelStateChange, null));
       }
     };
   }
@@ -314,6 +320,32 @@ private Auth.TokenRequest decodeTokenRequest(Map<String, Object> jsonMap) {
     return o;
   }
 
+  private ChannelOptions decodeRestChannelOptions(Map<String, Object> jsonMap) {
+    if (jsonMap == null) return null;
+    final Object cipher = jsonMap.get(PlatformConstants.TxRealtimeChannelOptions.cipher);
+    try {
+      return ChannelOptions.withCipherKey((String) cipher);
+    } catch (AblyException ae) {
+      System.out.println("Exception while decoding RestChannelOptions : " + ae);
+      return null;
+    }
+  }
+
+  private ChannelOptions decodeRealtimeChannelOptions(Map<String, Object> jsonMap) {
+    if (jsonMap == null) return null;
+    final Object cipher = jsonMap.get(PlatformConstants.TxRealtimeChannelOptions.cipher);
+    try {
+      final ChannelOptions o = ChannelOptions.withCipherKey((String) cipher);
+      readValueFromJson(jsonMap, PlatformConstants.TxRealtimeChannelOptions.params, v -> o.cipherParams = (Map<String, String>) v);
+      // modes is not supported in ably-java
+      // Track @ https://github.com/ably/ably-flutter/issues/14
+      return o;
+    } catch (AblyException ae) {
+      System.out.println("Exception while decoding RealtimeChannelOptions: " + ae);
+      return null;
+    }
+  }
+
   private Param[] decodeRestHistoryParams(Map<String, Object> jsonMap) {
     if (jsonMap == null) return null;
     Param[] params = new Param[jsonMap.size()];
@@ -573,9 +605,9 @@ private Map<String, Object> encodePaginatedResult(AsyncPaginatedResult<Object> c
           list.add((Map<String, Object>) pair.encode(item));
         }
         writeValueToJson(
-          jsonMap,
-          PlatformConstants.TxPaginatedResult.items,
-          list
+            jsonMap,
+            PlatformConstants.TxPaginatedResult.items,
+            list
         );
         writeValueToJson(jsonMap, PlatformConstants.TxPaginatedResult.type, type & 0xff);
       }