fix #1155

pichillilorenzo · Apr 26, 2022 · 442b51d · 442b51d
1 parent f885a05
commit 442b51d
Show file tree

Hide file tree

Showing 12 changed files with 157 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.4.2+1
+
+- Fixed "Latest version 5.4.2 crashes on Android - HeadlessInAppWebView.dispose" [#1155](https://github.com/pichillilorenzo/flutter_inappwebview/issues/1155)
+
 ## 5.4.2
 
 - Added `setActionButton` method to `ChromeSafariBrowser` class

diff --git a/...oid/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFlutterPlugin.java b/...oid/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFlutterPlugin.java
@@ -6,6 +6,8 @@
 import android.os.Build;
 import android.webkit.ValueCallback;
 
+import androidx.annotation.Nullable;
+
 import com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ChromeSafariBrowserManager;
 import com.pichillilorenzo.flutter_inappwebview.credential_database.CredentialDatabaseHandler;
 import com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserManager;
@@ -41,7 +43,9 @@ public class InAppWebViewFlutterPlugin implements FlutterPlugin, ActivityAware {
   public PluginRegistry.Registrar registrar;
   public BinaryMessenger messenger;
   public FlutterPlugin.FlutterAssets flutterAssets;
+  @Nullable
   public ActivityPluginBinding activityPluginBinding;
+  @Nullable
   public Activity activity;
   @SuppressWarnings("deprecation")
   public FlutterView flutterView;

diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewStatic.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewStatic.java
@@ -79,7 +79,7 @@ public void onReceiveValue(Boolean value) {
           result.success(false);
         break;
       case "getCurrentWebViewPackage":
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && plugin != null && plugin.activity != null) {
           result.success(convertWebViewPackageToMap(WebViewCompat.getCurrentWebViewPackage(plugin.activity)));
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
           //with Android Lollipop (API 21) they started to update the WebView

diff --git a/...com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivity.java b/...com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivity.java
@@ -41,6 +41,7 @@ public class ChromeCustomTabsActivity extends Activity implements MethodChannel.
   protected final int CHROME_CUSTOM_TAB_REQUEST_CODE = 100;
   protected boolean onChromeSafariBrowserOpened = false;
   protected boolean onChromeSafariBrowserCompletedInitialLoad = false;
+  @Nullable
   public ChromeSafariBrowserManager manager;
   public String initialUrl;
   public List<CustomTabsMenuItem> menuItems = new ArrayList<>();
@@ -137,11 +138,13 @@ public void onMethodCall(final MethodCall call, final MethodChannel.Result resul
         this.onDestroy();
         this.close();
 
-        // https://stackoverflow.com/a/41596629/4637638
-        Intent myIntent = new Intent(manager.plugin.activity, manager.plugin.activity.getClass());
-        myIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        myIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        manager.plugin.activity.startActivity(myIntent);
+        if (manager != null && manager.plugin != null && manager.plugin.activity != null) {
+          // https://stackoverflow.com/a/41596629/4637638
+          Intent myIntent = new Intent(manager.plugin.activity, manager.plugin.activity.getClass());
+          myIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+          myIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+          manager.plugin.activity.startActivity(myIntent);
+        }
 
         dispose();
 

diff --git a/...m/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeSafariBrowserManager.java b/...m/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeSafariBrowserManager.java
@@ -41,7 +41,7 @@ public void onMethodCall(final MethodCall call, final MethodChannel.Result resul
 
     switch (call.method) {
       case "open":
-        if (plugin != null) {
+        if (plugin != null && plugin.activity != null) {
           String url = (String) call.argument("url");
           HashMap<String, Object> options = (HashMap<String, Object>) call.argument("options");
           HashMap<String, Object> actionButton = (HashMap<String, Object>) call.argument("actionButton");
@@ -52,7 +52,7 @@ public void onMethodCall(final MethodCall call, final MethodChannel.Result resul
         }
         break;
       case "isAvailable":
-        if (plugin != null) {
+        if (plugin != null && plugin.activity != null) {
           result.success(CustomTabActivityHelper.isAvailable(plugin.activity));
         } else {
           result.success(false);

diff --git a/...om/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessInAppWebView.java b/...om/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessInAppWebView.java
@@ -70,21 +70,23 @@ public void onWebViewCreated() {
   }
 
   public void prepare(Map<String, Object> params) {
-    // Add the headless WebView to the view hierarchy.
-    // This way is also possible to take screenshots.
-    ViewGroup contentView = (ViewGroup) plugin.activity.findViewById(android.R.id.content);
-    ViewGroup mainView = (ViewGroup) (contentView).getChildAt(0);
-    if (mainView != null) {
-      View view = flutterWebView.getView();
-      final Map<String, Object> initialSize = (Map<String, Object>) params.get("initialSize");
-      Size2D size = Size2D.fromMap(initialSize);
-      if (size != null) {
-        setSize(size);
-      } else {
-        view.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+    if (plugin != null && plugin.activity != null) {
+      // Add the headless WebView to the view hierarchy.
+      // This way is also possible to take screenshots.
+      ViewGroup contentView = (ViewGroup) plugin.activity.findViewById(android.R.id.content);
+      ViewGroup mainView = (ViewGroup) (contentView).getChildAt(0);
+      if (mainView != null && flutterWebView != null) {
+        View view = flutterWebView.getView();
+        final Map<String, Object> initialSize = (Map<String, Object>) params.get("initialSize");
+        Size2D size = Size2D.fromMap(initialSize);
+        if (size != null) {
+          setSize(size);
+        } else {
+          view.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        }
+        mainView.addView(view, 0);
+        view.setVisibility(View.INVISIBLE);
       }
-      mainView.addView(view, 0);
-      view.setVisibility(View.INVISIBLE);
     }
   }
 
@@ -110,7 +112,7 @@ public Size2D getSize() {
   public void dispose() {
     channel.setMethodCallHandler(null);
     HeadlessInAppWebViewManager.webViews.remove(id);
-    if (plugin != null) {
+    if (plugin != null && plugin.activity != null) {
       ViewGroup contentView = (ViewGroup) plugin.activity.findViewById(android.R.id.content);
       ViewGroup mainView = (ViewGroup) (contentView).getChildAt(0);
       if (mainView != null && flutterWebView != null) {

diff --git a/...ain/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserManager.java b/...ain/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserManager.java
@@ -72,13 +72,19 @@ public InAppBrowserManager(final InAppWebViewFlutterPlugin plugin) {
   public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) {
     switch (call.method) {
       case "open":
-        open(plugin.activity, (Map<String, Object>) call.arguments());
-        result.success(true);
+        if (plugin != null && plugin.activity != null) {
+          open(plugin.activity, (Map<String, Object>) call.arguments());
+          result.success(true);
+        } else {
+          result.success(false);
+        }
         break;
       case "openWithSystemBrowser":
-        {
+        if (plugin != null && plugin.activity != null) {
           String url = (String) call.argument("url");
           openWithSystemBrowser(plugin.activity, url, result);
+        } else {
+          result.success(false);
         }
         break;
       default:

diff --git a/...src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_webview/FlutterWebView.java b/...src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_webview/FlutterWebView.java
@@ -60,7 +60,7 @@ public FlutterWebView(final InAppWebViewFlutterPlugin plugin, final Context cont
     InAppWebViewOptions options = new InAppWebViewOptions();
     options.parse(initialOptions);
 
-    if (plugin.activity == null) {
+    if (plugin == null || plugin.activity == null) {
       Log.e(LOG_TAG, "\n\n\nERROR: You need to upgrade your Flutter project to use the new Java Embedding API:\n\n" +
               "- Take a look at the \"IMPORTANT Note for Android\" section here: https://github.com/pichillilorenzo/flutter_inappwebview#important-note-for-android\n" +
               "- See the official wiki here: https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects\n\n\n");

diff --git a/...d/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_webview/InAppWebView.java b/...d/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_webview/InAppWebView.java
@@ -175,7 +175,9 @@ public InAppWebView(Context context, InAppWebViewFlutterPlugin plugin,
     this.options = options;
     this.contextMenu = contextMenu;
     this.userContentController.addUserOnlyScripts(userScripts);
-    plugin.activity.registerForContextMenu(this);
+    if (plugin != null && plugin.activity != null) {
+      plugin.activity.registerForContextMenu(this);
+    }
   }
 
   public void prepare() {
@@ -1216,20 +1218,22 @@ public void setDesktopMode(final boolean enabled) {
 
   @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   public void printCurrentPage() {
-    // Get a PrintManager instance
-    PrintManager printManager = (PrintManager) plugin.activity.getSystemService(Context.PRINT_SERVICE);
+    if (plugin != null && plugin.activity != null) {
+      // Get a PrintManager instance
+      PrintManager printManager = (PrintManager) plugin.activity.getSystemService(Context.PRINT_SERVICE);
 
-    if (printManager != null) {
-      String jobName = getTitle() + " Document";
+      if (printManager != null) {
+        String jobName = getTitle() + " Document";
 
-      // Get a printCurrentPage adapter instance
-      PrintDocumentAdapter printAdapter = createPrintDocumentAdapter(jobName);
+        // Get a printCurrentPage adapter instance
+        PrintDocumentAdapter printAdapter = createPrintDocumentAdapter(jobName);
 
-      // Create a printCurrentPage job with name and adapter instance
-      printManager.print(jobName, printAdapter,
-              new PrintAttributes.Builder().build());
-    } else {
-      Log.e(LOG_TAG, "No PrintManager available");
+        // Create a printCurrentPage job with name and adapter instance
+        printManager.print(jobName, printAdapter,
+                new PrintAttributes.Builder().build());
+      } else {
+        Log.e(LOG_TAG, "No PrintManager available");
+      }
     }
   }