Merge pull request #303 from ably/bug/android_push_npe_channel

Checked for nullity of activation / deactivation results
ably · Jan 24, 2022 · 0b0a8d8 · 0b0a8d8
2 parents 304ee02 + f9534e5
commit 0b0a8d8
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/android/src/main/java/io/ably/flutter/plugin/push/PushActivationEventHandlers.java b/android/src/main/java/io/ably/flutter/plugin/push/PushActivationEventHandlers.java
@@ -64,13 +64,23 @@ public void onReceive(Context context, Intent intent) {
       switch (action) {
         case PUSH_ACTIVATE_ACTION:
           callCallbackOnDartSide(PlatformConstants.PlatformMethod.pushOnActivate, errorInfo);
-          returnMethodCallResult(resultForActivate, errorInfo);
-          resultForActivate = null;
+          if (resultForActivate != null) {
+            Log.d(TAG, "resultForActivate received on PUSH_ACTIVATE_ACTION.");
+            returnMethodCallResult(resultForActivate, errorInfo);
+            resultForActivate = null;
+          } else {
+            Log.e(TAG, "resultForActivate is null on PUSH_ACTIVATE_ACTION.");
+          }
           break;
         case PUSH_DEACTIVATE_ACTION:
           callCallbackOnDartSide(PlatformConstants.PlatformMethod.pushOnDeactivate, errorInfo);
-          returnMethodCallResult(resultForDeactivate, errorInfo);
-          resultForDeactivate = null;
+          if (resultForDeactivate != null) {
+            Log.d(TAG, "resultForDeactivate received on PUSH_DEACTIVATE_ACTION.");
+            returnMethodCallResult(resultForDeactivate, errorInfo);
+            resultForDeactivate = null;
+          } else {
+            Log.e(TAG, "resultForDeactivate is null on PUSH_DEACTIVATE_ACTION.");
+          }
           break;
         case PUSH_UPDATE_FAILED_ACTION:
           callCallbackOnDartSide(PlatformConstants.PlatformMethod.pushOnUpdateFailed, errorInfo);