Fixed Android NullPointerException on InAppBrowserActivity.dispose

pichillilorenzo · Nov 18, 2022 · 81d83a2 · 81d83a2
1 parent 7539d26
commit 81d83a2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.7.1+2
+
+- Fixed Android `NullPointerException` on `InAppBrowserActivity.dispose`
+
 ## 5.7.1+1
 
 - Fixed User Script remove methods

diff --git a/...in/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserActivity.java b/...in/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserActivity.java
@@ -46,6 +46,7 @@
 public class InAppBrowserActivity extends AppCompatActivity implements InAppBrowserDelegate {
 
   static final String LOG_TAG = "InAppBrowserActivity";
+  @Nullable
   public MethodChannel channel;
   public Integer windowId;
   public String id;
@@ -522,7 +523,10 @@ protected void onActivityResult (int requestCode,
   }
 
   public void dispose() {
-    channel.setMethodCallHandler(null);
+    if (channel != null) {
+      channel.setMethodCallHandler(null);
+      channel = null;
+    }
     activityResultListeners.clear();
     if (methodCallDelegate != null) {
       methodCallDelegate.dispose();

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_inappwebview
 description: A Flutter plugin that allows you to add an inline webview, to use an headless webview, and to open an in-app browser window.
-version: 5.7.1+1
+version: 5.7.1+2
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues