From a4c5dea19ac38393f7cfc3d235ec6d989b4f93db Mon Sep 17 00:00:00 2001 From: Ben Butterworth <24711048+ben-xD@users.noreply.github.com> Date: Tue, 16 Nov 2021 09:31:35 +0000 Subject: [PATCH 1/3] Remove unnecessary print statements, and use Log.w where necessary --- .../io/ably/flutter/plugin/AblyEventStreamHandler.java | 4 +++- .../java/io/ably/flutter/plugin/AblyFlutterPlugin.java | 4 +--- .../java/io/ably/flutter/plugin/AblyMessageCodec.java | 8 +++++--- .../io/ably/flutter/plugin/AblyMethodCallHandler.java | 7 +------ 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/android/src/main/java/io/ably/flutter/plugin/AblyEventStreamHandler.java b/android/src/main/java/io/ably/flutter/plugin/AblyEventStreamHandler.java index 9a6056970..4db333552 100644 --- a/android/src/main/java/io/ably/flutter/plugin/AblyEventStreamHandler.java +++ b/android/src/main/java/io/ably/flutter/plugin/AblyEventStreamHandler.java @@ -3,6 +3,7 @@ import android.content.Context; import android.os.Handler; import android.os.Looper; +import android.util.Log; import java.util.Map; @@ -26,6 +27,7 @@ */ public class AblyEventStreamHandler implements EventChannel.StreamHandler { + private static final String TAG = AblyEventStreamHandler.class.getName(); /** * Creating an ablyLibrary instance. * As ablyLibrary is a singleton, @@ -197,7 +199,7 @@ public void onListen(Object object, EventChannel.EventSink uiThreadEventSink) { @Override public void onCancel(Object object) { if (object == null) { - System.out.println("Cannot process null input on cancel"); + Log.w(TAG, "onCancel cannot decode null"); return; } final AblyFlutterMessage> ablyMessage = getMessage(object); diff --git a/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java b/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java index 45bdecca7..9be9a12f8 100644 --- a/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java +++ b/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java @@ -76,9 +76,7 @@ private void setupChannels(BinaryMessenger messenger, Context applicationContext } @Override - public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { - System.out.println("Ably Plugin onDetachedFromEngine"); - } + public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {} private static MethodCodec createCodec(CipherParamsStorage cipherParamsStorage) { return new StandardMethodCodec(new AblyMessageCodec(cipherParamsStorage)); 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 a7b176f26..96fb5c72d 100644 --- a/android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java +++ b/android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java @@ -1,5 +1,7 @@ package io.ably.flutter.plugin; +import android.util.Log; + import androidx.annotation.Nullable; import com.google.firebase.messaging.RemoteMessage; @@ -58,7 +60,7 @@ interface CodecDecoder { } private static class CodecPair { - + private static final String TAG = CodecPair.class.getName(); final CodecEncoder encoder; final CodecDecoder decoder; @@ -69,7 +71,7 @@ private static class CodecPair { Map encode(final Object value) { if (this.encoder == null) { - System.out.println("Codec encoder not defined"); + Log.w(TAG, "Encoder is null"); return null; } return this.encoder.encode((T) value); @@ -77,7 +79,7 @@ Map encode(final Object value) { T decode(Map jsonMap) { if (this.decoder == null) { - System.out.println("Codec decoder not defined"); + Log.w(TAG, "Decoder is null"); return null; } return this.decoder.decode(jsonMap); diff --git a/android/src/main/java/io/ably/flutter/plugin/AblyMethodCallHandler.java b/android/src/main/java/io/ably/flutter/plugin/AblyMethodCallHandler.java index b12924835..dfc8545bb 100644 --- a/android/src/main/java/io/ably/flutter/plugin/AblyMethodCallHandler.java +++ b/android/src/main/java/io/ably/flutter/plugin/AblyMethodCallHandler.java @@ -151,7 +151,6 @@ private void handleAblyException(@NonNull MethodChannel.Result result, @NonNull @Override public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result rawResult) { final MethodChannel.Result result = new MethodResultWrapper(rawResult); - System.out.println("Ably Plugin handle: " + call.method); final BiConsumer handler = _map.get(call.method); if (null == handler) { // We don't have a handler for a method with this name so tell the caller. @@ -177,7 +176,6 @@ public void onError(ErrorInfo reason) { } private void register(@NonNull MethodCall call, @NonNull MethodChannel.Result result) { - System.out.println("Registering library instance to clean up any existing instances"); hotRestartCallback.on(); _ably.dispose(); result.success(null); @@ -205,10 +203,7 @@ public void success(@Nullable Object result) { @Override public void error(String errorCode, @Nullable String errorMessage, @Nullable Object errorDetails) { - System.out.println(errorDetails); - if (errorMessage != null) { - result.error("40000", String.format("Error from authCallback: %s", errorMessage), errorDetails); - } + result.error("40000", String.format("Error from authCallback: %s", errorMessage), errorDetails); latch.countDown(); } From a246b9e85d2586219ce8225ac7e82dadefea2cdf Mon Sep 17 00:00:00 2001 From: Ben Butterworth <24711048+ben-xD@users.noreply.github.com> Date: Tue, 16 Nov 2021 14:31:25 +0000 Subject: [PATCH 2/3] Remove empty method override --- .../main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java b/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java index 9be9a12f8..1576f49b8 100644 --- a/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java +++ b/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java @@ -75,9 +75,6 @@ private void setupChannels(BinaryMessenger messenger, Context applicationContext PushMessagingEventHandlers.reset(applicationContext, methodChannel); } - @Override - public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {} - private static MethodCodec createCodec(CipherParamsStorage cipherParamsStorage) { return new StandardMethodCodec(new AblyMessageCodec(cipherParamsStorage)); } From 84c8aad7dd642ddeeb2809e688e22d81d423a450 Mon Sep 17 00:00:00 2001 From: Ben Butterworth <24711048+ben-xD@users.noreply.github.com> Date: Wed, 17 Nov 2021 15:32:03 +0000 Subject: [PATCH 3/3] Revert "Remove empty method override" This reverts commit a246b9e85d2586219ce8225ac7e82dadefea2cdf. --- .../main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java b/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java index 1576f49b8..9be9a12f8 100644 --- a/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java +++ b/android/src/main/java/io/ably/flutter/plugin/AblyFlutterPlugin.java @@ -75,6 +75,9 @@ private void setupChannels(BinaryMessenger messenger, Context applicationContext PushMessagingEventHandlers.reset(applicationContext, methodChannel); } + @Override + public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {} + private static MethodCodec createCodec(CipherParamsStorage cipherParamsStorage) { return new StandardMethodCodec(new AblyMessageCodec(cipherParamsStorage)); }