Merge pull request #380 from luisfelipeas5/fix/use-method-channel-aft…

…er-on-destroy fix: stop using methodChannel after onDestroy (NullPointerException on BackgroundService.java:237)
ekasetiawans · Nov 18, 2023 · 0703733 · 0703733
2 parents 674cbc3 + cd0d098
commit 0703733
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/...ndroid/android/src/main/java/id/flutter/flutter_background_service/BackgroundService.java b/...ndroid/android/src/main/java/id/flutter/flutter_background_service/BackgroundService.java
@@ -122,9 +122,9 @@ public void onDestroy() {
             backgroundEngine = null;
         }
 
+        FlutterBackgroundServicePlugin.servicePipe.removeListener(listener);
         methodChannel = null;
         dartEntrypoint = null;
-        FlutterBackgroundServicePlugin.servicePipe.removeListener(listener);
         super.onDestroy();
     }
 
@@ -235,18 +235,15 @@ private void runService() {
     }
 
     public void receiveData(JSONObject data) {
-        if (methodChannel != null) {
-            try {
-                final JSONObject arg = data;
-                mainHandler.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        methodChannel.invokeMethod("onReceiveData", arg);
-                    }
-                });
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+        if (methodChannel == null) return;
+        try {
+            final JSONObject arg = data;
+            mainHandler.post(() -> {
+                if (methodChannel == null) return;
+                methodChannel.invokeMethod("onReceiveData", arg);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }