Fixes #1: Handle json encoding properly on android

chinloyal · Nov 17, 2020 · b221159 · b221159
1 parent e378881
commit b221159
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.0.2 - November 17, 2020
+* BUGFIX: Fixes issue #1, Double backslashes in the bind event breaks the JSON encoding. (This issue was only on android, iOS worked fine.)
+
 ## 1.0.1 - November 7, 2020
 
 * BUGFIX: Fixed not being able to bind to multiple types of channels at once.

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Add to your pubspec.yaml
 
 ```yaml
 dependencies:
-    pusher_client: ^1.0.1
+    pusher_client: ^1.0.2
 ```
 
 ## Configuration
@@ -113,7 +113,7 @@ Then in `android/app/proguard-rules.pro`:
 
 ## API Overview
 
-Here's the API in nutshell.
+Here's the API in a nutshell.
 
 ```dart
 PusherOptions options = PusherOptions(

diff --git a/android/src/main/kotlin/com/github/chinloyal/pusher_client/pusher/PusherService.kt b/android/src/main/kotlin/com/github/chinloyal/pusher_client/pusher/PusherService.kt
@@ -75,6 +75,7 @@ class PusherService : MChannel {
     }
 
     private fun init(call: MethodCall, result: Result) {
+        // toString works because this is json encoded in dart
         val args = JSONObject(call.arguments.toString())
         val initArgs: JSONObject = args.getJSONObject("initArgs")
         enableLogging = initArgs.getBoolean("enableLogging")
@@ -135,7 +136,8 @@ class PusherService : MChannel {
 
     private fun subscribe(call: MethodCall, result: Result) {
         try {
-            val args = JSONObject(call.arguments.toString())
+            val src = call.arguments as Map<String, Any>
+            val args = JSONObject(src)
             val channelName: String = args.getString("channelName")
 
             when {
@@ -171,7 +173,8 @@ class PusherService : MChannel {
 
     private fun unsubscribe(call: MethodCall, result: Result) {
         try {
-            val args = JSONObject(call.arguments.toString());
+            val src = call.arguments as Map<String, Any>
+            val args = JSONObject(src);
             val channelName = args.getString("channelName")
 
             _pusherInstance?.unsubscribe(channelName)
@@ -190,7 +193,8 @@ class PusherService : MChannel {
      */
     private fun bind(call: MethodCall, result: Result) {
         try {
-            val args = JSONObject(call.arguments.toString())
+            val src = call.arguments as Map<String, Any>
+            val args = JSONObject(src)
             val channelName: String = args.getString("channelName")
             val eventName: String = args.getString("eventName")
 
@@ -224,7 +228,8 @@ class PusherService : MChannel {
 
     private fun unbind(call: MethodCall, result: Result) {
         try {
-            val args = JSONObject(call.arguments.toString())
+            val src = call.arguments as Map<String, Any>
+            val args = JSONObject(src)
             val channelName: String = args.getString("channelName")
             val eventName: String = args.getString("eventName")
 
@@ -258,11 +263,12 @@ class PusherService : MChannel {
 
     private fun trigger(call: MethodCall, result: Result) {
         try {
+            // toString works because this is json encoded in dart
             val args = JSONObject(call.arguments.toString())
             val eventName: String = args.getString("eventName")
             val data: String = args.getString("data")
             val channelName: String = args.getString("channelName")
-            val errorMessage = "Trigger can only be called on private and presence channels.";
+            val errorMessage = "Trigger can only be called on private and presence channels."
             when {
                 channelName.startsWith(PRIVATE_ENCRYPTED_PREFIX) -> {
                     result.error("TRIGGER_ERROR", errorMessage, null)

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -339,7 +339,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.1"
+    version: "1.0.2"
   quiver:
     dependency: transitive
     description:

diff --git a/lib/src/pusher/pusher_client.dart b/lib/src/pusher/pusher_client.dart
@@ -35,20 +35,19 @@ class PusherClient {
     bool autoConnect = true,
   });
 
+  /// Creates a [PusherClient] -- returns the instance if it's already be called.
   factory PusherClient(
     String appKey,
     PusherOptions options, {
     bool enableLogging = true,
     bool autoConnect = true,
   }) {
-    if (_singleton == null) {
-      _singleton = PusherClient._(
-        appKey,
-        options,
-        enableLogging: enableLogging,
-        autoConnect: autoConnect,
-      );
-    }
+    _singleton ??= PusherClient._(
+      appKey,
+      options,
+      enableLogging: enableLogging,
+      autoConnect: autoConnect,
+    );
 
     final initArgs = _InitArgs(enableLogging: enableLogging);
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -2,7 +2,7 @@ name: pusher_client
 description: |
   A Pusher Channels client plugin for Flutter targeting Android and iOS. It 
   wraps pusher-websocket-java v2.2.5 and pusher-websocket-swift v8.0.0.
-version: 1.0.1
+version: 1.0.2
 homepage: https://github.com/chinloyal/pusher_client
 documentation: https://github.com/chinloyal/pusher_client/blob/master/README.md