androi: Fixed crash when trying to open InAppBrowser with R.menu.menu_main on release mode, updated android activities restore from savedInstanceState

Author: pichillilorenzo

flutter_inappwebview/CHANGELOG.md

@@ -17,6 +17,8 @@
 - Added `CookieManager.flush` method
 - Updated `InAppWebViewController.takeScreenshot` implementation to support screenshot out of visible viewport when `InAppWebViewController.enableSlowWholeDocumentDraw` is called
 - Fixed "After dispose a InAppWebViewKeepAlive using InAppWebViewController.disposeKeepAlive. NullPointerException is thrown when main activity enter destroyed state." [#2025](https://github.com/pichillilorenzo/flutter_inappwebview/issues/2025)
+- Fixed crash when trying to open InAppBrowser with R.menu.menu_main on release mode
+- Merged "Prevent blank InAppBrowser Activity from being restored" [#1984](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1984) (thanks to [ShuheiSuzuki-07](https://github.com/ShuheiSuzuki-07))
 
 #### macOS and iOS Platforms
 - Moved `WKUserContentController` initialization on `preWKWebViewConfiguration` to fix possible `undefined is not an object (evaluating 'window.webkit.messageHandlers')` javascript error

flutter_inappwebview/example/android/app/build.gradle

@@ -45,6 +45,10 @@ android {
 
     buildTypes {
         release {
+            // only for com.pichillilorenzo.flutter_inappwebview_android.R.menu.menu_main
+            minifyEnabled false
+            shrinkResources false
+
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug

flutter_inappwebview/example/lib/main.dart

@@ -22,8 +22,6 @@ Future main() async {
   // await Permission.microphone.request();
   // await Permission.storage.request();
 
-  await localhostServer.start();
-
   if (!kIsWeb && defaultTargetPlatform == TargetPlatform.windows) {
     final availableVersion = await WebViewEnvironment.getAvailableVersion();
     assert(availableVersion != null,

flutter_inappwebview/pubspec.yaml

@@ -21,11 +21,11 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_inappwebview_platform_interface: ^1.4.0
-  flutter_inappwebview_android: ^1.1.3
-  flutter_inappwebview_ios: ^1.1.2
-  flutter_inappwebview_macos: ^1.1.2
-  flutter_inappwebview_web: ^1.1.2
-  flutter_inappwebview_windows: ^0.6.0
+  flutter_inappwebview_android: ^1.2.0
+  flutter_inappwebview_ios: ^1.2.0
+  flutter_inappwebview_macos: ^1.2.0
+  flutter_inappwebview_web: ^1.2.0
+  flutter_inappwebview_windows: ^0.7.0
 
 dev_dependencies:
   flutter_test:

flutter_inappwebview_android/CHANGELOG.md

@@ -5,6 +5,8 @@
 - Added `CookieManager.flush` method
 - Updated `InAppWebViewController.takeScreenshot` implementation to support screenshot out of visible viewport when `InAppWebViewController.enableSlowWholeDocumentDraw` is called
 - Fixed "After dispose a InAppWebViewKeepAlive using InAppWebViewController.disposeKeepAlive. NullPointerException is thrown when main activity enter destroyed state." [#2025](https://github.com/pichillilorenzo/flutter_inappwebview/issues/2025)
+- Fixed crash when trying to open InAppBrowser with R.menu.menu_main on release mode
+- Merged "Prevent blank InAppBrowser Activity from being restored" [#1984](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1984) (thanks to [ShuheiSuzuki-07](https://github.com/ShuheiSuzuki-07))
 
 ## 1.1.3
 

flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsActivity.java

@@ -78,13 +78,23 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.chrome_custom_tabs_layout);
 
     Bundle b = getIntent().getExtras();
-    if (b == null) return;
+    if (b == null) {
+      if (savedInstanceState != null) {
+        close();
+      }
+      return;
+    }
 
     id = b.getString("id");
 
     String managerId = b.getString("managerId");
     manager = ChromeSafariBrowserManager.shared.get(managerId);
-    if (manager == null || manager.plugin == null || manager.plugin.messenger == null) return;
+    if (manager == null || manager.plugin == null || manager.plugin.messenger == null) {
+      if (savedInstanceState != null) {
+        close();
+      }
+      return;
+    }
 
     manager.browsers.put(id, this);
 

flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserActivity.java

@@ -51,7 +51,7 @@
 public class InAppBrowserActivity extends AppCompatActivity implements InAppBrowserDelegate, Disposable {
   protected static final String LOG_TAG = "InAppBrowserActivity";
   public static final String METHOD_CHANNEL_NAME_PREFIX = "com.pichillilorenzo/flutter_inappbrowser_";
-  
+
   @Nullable
   public Integer windowId;
   public String id;
@@ -77,24 +77,29 @@ public class InAppBrowserActivity extends AppCompatActivity implements InAppBrow
   @Nullable
   public InAppBrowserChannelDelegate channelDelegate;
   public List<InAppBrowserMenuItem> menuItems = new ArrayList<>();
-  
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    if (savedInstanceState != null) {
-      finish();
+    Bundle b = getIntent().getExtras();
+    if (b == null) {
+      if (savedInstanceState != null) {
+        finish();
+      }
       return;
     }
 
-    Bundle b = getIntent().getExtras();
-    if (b == null) return;
-    
     id = b.getString("id");
 
     String managerId = b.getString("managerId");
     manager = InAppBrowserManager.shared.get(managerId);
-    if (manager == null || manager.plugin == null|| manager.plugin.messenger == null) return;
+    if (manager == null || manager.plugin == null || manager.plugin.messenger == null) {
+      if (savedInstanceState != null) {
+        finish();
+      }
+      return;
+    }
 
     Map<String, Object> settingsMap = (Map<String, Object>) b.getSerializable("settings");
     customSettings.parse(settingsMap);
@@ -111,7 +116,7 @@ protected void onCreate(Bundle savedInstanceState) {
     pullToRefreshLayout.channelDelegate = new PullToRefreshChannelDelegate(pullToRefreshLayout, pullToRefreshLayoutChannel);
     pullToRefreshLayout.settings = pullToRefreshSettings;
     pullToRefreshLayout.prepare();
-    
+
     webView = findViewById(R.id.webView);
     webView.id = id;
     webView.windowId = windowId;
@@ -171,15 +176,13 @@ protected void onCreate(Bundle savedInstanceState) {
           Log.e(LOG_TAG, initialFile + " asset file cannot be found!", e);
           return;
         }
-      }
-      else if (initialData != null) {
+      } else if (initialData != null) {
         String mimeType = b.getString("initialMimeType");
         String encoding = b.getString("initialEncoding");
         String baseUrl = b.getString("initialBaseUrl");
         String historyUrl = b.getString("initialHistoryUrl");
         webView.loadDataWithBaseURL(baseUrl, initialData, mimeType, encoding, historyUrl);
-      }
-      else if (initialUrlRequest != null) {
+      } else if (initialUrlRequest != null) {
         URLRequest urlRequest = URLRequest.fromMap(initialUrlRequest);
         if (urlRequest != null) {
           webView.loadUrl(urlRequest);
@@ -242,8 +245,15 @@ public boolean onCreateOptionsMenu(Menu m) {
     }
 
     MenuInflater inflater = getMenuInflater();
-    // Inflate menu to add items to action bar if it is present.
-    inflater.inflate(R.menu.menu_main, menu);
+    try {
+      // Inflate menu to add items to action bar if it is present.
+      inflater.inflate(R.menu.menu_main, menu);
+    } catch (Exception e) {
+      e.printStackTrace();
+      Log.e(LOG_TAG, "Cannot inflate com.pichillilorenzo.flutter_inappwebview_android.R.menu.menu_main." +
+              "To make it work, you need to set minifyEnabled false and shrinkResources false in your build.gradle file.");
+      return super.onCreateOptionsMenu(m);
+    }
 
     MenuItem menuSearchItem = menu.findItem(R.id.menu_search);
     if (menuSearchItem != null) {
@@ -607,9 +617,9 @@ public List<ActivityResultListener> getActivityResultListeners() {
   }
 
   @Override
-  protected void onActivityResult (int requestCode,
-                                   int resultCode,
-                                   Intent data) {
+  protected void onActivityResult(int requestCode,
+                                  int resultCode,
+                                  Intent data) {
     for (ActivityResultListener listener : activityResultListeners) {
       if (listener.onActivityResult(requestCode, resultCode, data)) {
         return;