@capgo/inappbrowser 7.1.1 → 7.1.6

package/android/build.gradle

@@ -54,6 +54,7 @@ dependencies {
     implementation project(':capacitor-android')
     implementation 'com.caverock:androidsvg:1.4'
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
+    implementation "androidx.window:window:1.3.0"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

package/android/src/main/AndroidManifest.xml

@@ -7,6 +7,5 @@
         <data android:scheme="http" />
       </intent>
     </queries>
-  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
   <uses-permission android:name="android.permission.CAMERA"/>
 </manifest>

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/InAppBrowserPlugin.java

@@ -45,10 +45,6 @@ import org.json.JSONObject;
       alias = "storage",
       strings = { Manifest.permission.READ_EXTERNAL_STORAGE }
     ),
-    @Permission(
-      alias = "storage",
-      strings = { Manifest.permission.READ_MEDIA_IMAGES }
-    ),
   },
   requestCodes = { WebViewDialog.FILE_CHOOSER_REQUEST_CODE }
 )

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java

@@ -38,6 +38,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 import androidx.annotation.RequiresApi;
+import androidx.core.view.WindowInsetsControllerCompat;
 import com.caverock.androidsvg.SVG;
 import com.caverock.androidsvg.SVGParseException;
 import com.getcapacitor.JSObject;
@@ -163,6 +164,17 @@ public class WebViewDialog extends Dialog {
       WindowManager.LayoutParams.FLAG_FULLSCREEN
     );
     setContentView(R.layout.activity_browser);
+    getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+    WindowInsetsControllerCompat insetsController =
+      new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
+    insetsController.setAppearanceLightStatusBars(false);
+    getWindow()
+      .getDecorView()
+      .post(() -> {
+        getWindow().setStatusBarColor(Color.BLACK);
+      });
+
     getWindow()
       .setLayout(
         WindowManager.LayoutParams.MATCH_PARENT,
@@ -487,7 +499,7 @@ public class WebViewDialog extends Dialog {
       }
     );
 
-    View closeButton = _toolbar.findViewById(R.id.closeButton);
+    ImageButton closeButton = _toolbar.findViewById(R.id.closeButton);
     closeButton.setOnClickListener(
       new View.OnClickListener() {
         @Override
@@ -520,7 +532,7 @@ public class WebViewDialog extends Dialog {
     );
 
     if (_options.showArrow()) {
-      closeButton.setBackgroundResource(R.drawable.arrow_forward_enabled);
+      closeButton.setImageResource(R.drawable.arrow_back_enabled);
     }
 
     if (_options.getShowReloadButton()) {

package/ios/Plugin/InAppBrowserPlugin.swift

@@ -289,8 +289,10 @@ public class InAppBrowserPlugin: CAPPlugin {
             call.reject("Cannot get script to execute")
             return
         }
-        self.webViewController?.executeScript(script: script)
-        call.resolve()
+        DispatchQueue.main.async {
+            self.webViewController?.executeScript(script: script)
+            call.resolve()
+        }
     }
 
     @objc func postMessage(_ call: CAPPluginCall) {
@@ -302,7 +304,9 @@ public class InAppBrowserPlugin: CAPPlugin {
         }
         print("Event data: \(eventData)")
 
-        self.webViewController?.postMessageToJS(message: eventData)
+        DispatchQueue.main.async {
+            self.webViewController?.postMessageToJS(message: eventData)
+        }
         call.resolve()
     }
 

package/ios/Plugin/WKWebViewController.swift

@@ -239,7 +239,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         if let jsonData = try? JSONSerialization.data(withJSONObject: message, options: []),
            let jsonString = String(data: jsonData, encoding: .utf8) {
             let script = "window.dispatchEvent(new CustomEvent('messageFromNative', { detail: \(jsonString) }));"
-            webView?.evaluateJavaScript(script, completionHandler: nil)
+            DispatchQueue.main.async {
+                self.webView?.evaluateJavaScript(script, completionHandler: nil)
+            }
         }
     }
 
@@ -842,9 +844,11 @@ extension WKWebViewController: WKUIDelegate {
         // Ensure UI updates are on the main thread
         DispatchQueue.main.async {
             let alertController = UIAlertController(title: nil, message: message, preferredStyle: .alert)
+            alertController.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
+                completionHandler()
+            }))
             self.present(alertController, animated: true, completion: nil)
         }
-        completionHandler()
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "7.1.1",
+  "version": "7.1.6",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",