Merge pull request #473 from ably/fix/missing-clientOptions-decoders

[SDK-3701] Fix/missing client options android decoder
ably · Jul 18, 2023 · 42dec31 · 42dec31
2 parents 085a833 + 3e60133
commit 42dec31
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -23,7 +23,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
     // https://github.com/ably/ably-java/
-    implementation 'io.ably:ably-android:1.2.28'
+    implementation 'io.ably:ably-android:1.2.31'
 
     // https://firebase.google.com/docs/cloud-messaging/android/client
     implementation 'com.google.firebase:firebase-messaging:23.0.4'

diff --git a/android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java b/android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java
@@ -353,6 +353,9 @@ private PlatformClientOptions decodeClientOptions(Map<String, Object> jsonMap) {
         readValueFromJson(jsonMap, PlatformConstants.TxClientOptions.fallbackHostsUseDefault, v -> clientOptions.fallbackHostsUseDefault = (Boolean) v);
         readValueFromJson(jsonMap, PlatformConstants.TxClientOptions.fallbackRetryTimeout, v -> clientOptions.fallbackRetryTimeout = readValueAsLong(v));
         readValueFromJson(jsonMap, PlatformConstants.TxClientOptions.defaultTokenParams, v -> clientOptions.defaultTokenParams = decodeTokenParams((Map<String, Object>) v));
+        readValueFromJson(jsonMap, PlatformConstants.TxClientOptions.disconnectedRetryTimeout, v -> clientOptions.disconnectedRetryTimeout = (Integer) v);
+        readValueFromJson(jsonMap, PlatformConstants.TxClientOptions.suspendedRetryTimeout, v -> clientOptions.suspendedRetryTimeout = (Integer) v);
+        readValueFromJson(jsonMap, PlatformConstants.TxClientOptions.httpMaxRetryDuration, v -> clientOptions.httpMaxRetryDuration = (Integer) v);
         readValueFromJson(jsonMap, PlatformConstants.TxClientOptions.channelRetryTimeout, v -> clientOptions.channelRetryTimeout = (Integer) v);
         readValueFromJson(jsonMap, PlatformConstants.TxClientOptions.transportParams, v -> clientOptions.transportParams = decodeTransportParams((Map<String, String>) v));
 

diff --git a/android/src/main/java/io/ably/flutter/plugin/generated/PlatformConstants.java b/android/src/main/java/io/ably/flutter/plugin/generated/PlatformConstants.java
@@ -176,6 +176,9 @@ static final public class TxClientOptions {
         public static final String recover = "recover";
         public static final String environment = "environment";
         public static final String idempotentRestPublishing = "idempotentRestPublishing";
+        public static final String disconnectedRetryTimeout = "disconnectedRetryTimeout";
+        public static final String suspendedRetryTimeout = "suspendedRetryTimeout";
+        public static final String httpMaxRetryDuration = "httpMaxRetryDuration";
         public static final String httpOpenTimeout = "httpOpenTimeout";
         public static final String httpRequestTimeout = "httpRequestTimeout";
         public static final String httpMaxRetryCount = "httpMaxRetryCount";

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   stream_transform: ^2.0.0
   enum_to_string: ^2.0.1
   flutter_local_notifications: ^9.2.0
-  fluttertoast: ^8.0.8
+  fluttertoast: 8.0.2
   device_info_plus: ^3.2.1
   crypto: ^3.0.1
   flutter_hooks: ^0.18.2