From 6f5621ad9c55ad84ca40449103e0b1a51d7c1d81 Mon Sep 17 00:00:00 2001 From: sacOO7 Date: Thu, 6 Jul 2023 23:19:05 +0530 Subject: [PATCH 1/5] Bumped up ably-java dependency to latest version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 7ac0a3a9c..f8640afe2 100644 --- 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' From 68720097b12c2ef2b6d96d53e692f80997336fa4 Mon Sep 17 00:00:00 2001 From: sacOO7 Date: Thu, 6 Jul 2023 23:31:16 +0530 Subject: [PATCH 2/5] Added mapping for missing clientOptions in android decoder --- .../src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java | 3 +++ .../io/ably/flutter/plugin/generated/PlatformConstants.java | 3 +++ 2 files changed, 6 insertions(+) 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 41e70f9f1..8cbc88ec6 100644 --- 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 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) 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) 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 index a15342698..18be4726a 100644 --- 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"; From d804379f1f0cc5cadd40f7fa0d7dcd1fc307bd40 Mon Sep 17 00:00:00 2001 From: sacOO7 Date: Mon, 10 Jul 2023 22:47:43 +0530 Subject: [PATCH 3/5] Updated kotlin gradle plugin version as per suggestion --- example/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/android/build.gradle b/example/android/build.gradle index 15b2ce63d..36e262c0d 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.5.31' + ext.kotlin_version = '1.9.0' repositories { google() From 5fa7f73c1dd6416ae63e583f4ed1237e64d02fe3 Mon Sep 17 00:00:00 2001 From: sacOO7 Date: Mon, 17 Jul 2023 23:14:16 +0530 Subject: [PATCH 4/5] Locked fluttertoast version to 8.0.2 --- example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index e8ad5b635..b0e7cca9e 100644 --- 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 From 3e601331c4b46435d557d4d007c82378997af1b3 Mon Sep 17 00:00:00 2001 From: sacOO7 Date: Mon, 17 Jul 2023 23:16:05 +0530 Subject: [PATCH 5/5] reverted kotlin version to old one --- example/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/android/build.gradle b/example/android/build.gradle index 36e262c0d..15b2ce63d 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.9.0' + ext.kotlin_version = '1.5.31' repositories { google()