@capgo/inappbrowser 6.0.0 → 6.0.3

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

@@ -1,18 +1,29 @@
 package ee.forgr.capacitor_inappbrowser;
 
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.net.Uri;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.webkit.PermissionRequest;
+import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageButton;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.Toolbar;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -25,11 +36,28 @@ public class WebViewDialog extends Dialog {
   private WebView _webView;
   private Toolbar _toolbar;
   private Options _options;
+  private Context _context;
+  public Activity activity;
   private boolean isInitialized = false;
 
-  public WebViewDialog(Context context, int theme, Options options) {
+  public PermissionRequest currentPermissionRequest;
+
+  public interface PermissionHandler {
+    void handleCameraPermissionRequest(PermissionRequest request);
+  }
+
+  private PermissionHandler permissionHandler;
+
+  public WebViewDialog(
+    Context context,
+    int theme,
+    Options options,
+    PermissionHandler permissionHandler
+  ) {
     super(context, theme);
     this._options = options;
+    this._context = context;
+    this.permissionHandler = permissionHandler;
     this.isInitialized = false;
   }
 
@@ -54,18 +82,66 @@ public class WebViewDialog extends Dialog {
     _webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
     _webView.getSettings().setDatabaseEnabled(true);
     _webView.getSettings().setDomStorageEnabled(true);
+    _webView.getSettings().setAllowFileAccess(true);
     _webView
       .getSettings()
       .setPluginState(android.webkit.WebSettings.PluginState.ON);
     _webView.getSettings().setLoadWithOverviewMode(true);
     _webView.getSettings().setUseWideViewPort(true);
+    _webView.getSettings().setAllowFileAccessFromFileURLs(true);
+    _webView.getSettings().setAllowUniversalAccessFromFileURLs(true);
+
+    _webView.setWebViewClient(new WebViewClient());
+
+    _webView.setWebChromeClient(
+      new WebChromeClient() {
+        // Grant permissions for cam
+
+        @Override
+        public void onPermissionRequest(final PermissionRequest request) {
+          Log.i(
+            "INAPPBROWSER",
+            "onPermissionRequest " + request.getResources().toString()
+          );
+          final String[] requestedResources = request.getResources();
+          for (String r : requestedResources) {
+            Log.i("INAPPBROWSER", "requestedResources " + r);
+            if (r.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
+              Log.i("INAPPBROWSER", "RESOURCE_VIDEO_CAPTURE req");
+              // Store the permission request
+              currentPermissionRequest = request;
+              // Initiate the permission request through the plugin
+              if (permissionHandler != null) {
+                permissionHandler.handleCameraPermissionRequest(request);
+              }
+              break;
+            }
+          }
+        }
+
+        @Override
+        public void onPermissionRequestCanceled(PermissionRequest request) {
+          super.onPermissionRequestCanceled(request);
+          Toast.makeText(
+            WebViewDialog.this.activity,
+            "Permission Denied",
+            Toast.LENGTH_SHORT
+          ).show();
+          // Handle the denied permission
+          if (currentPermissionRequest != null) {
+            currentPermissionRequest.deny();
+            currentPermissionRequest = null;
+          }
+        }
+      }
+    );
 
     Map<String, String> requestHeaders = new HashMap<>();
     if (_options.getHeaders() != null) {
       Iterator<String> keys = _options.getHeaders().keys();
       while (keys.hasNext()) {
         String key = keys.next();
-        if (TextUtils.equals(key, "User-Agent")) {
+        if (TextUtils.equals(key.toLowerCase(), "user-agent")) {
           _webView
             .getSettings()
             .setUserAgentString(_options.getHeaders().getString(key));
@@ -88,13 +164,29 @@ public class WebViewDialog extends Dialog {
     }
   }
 
+  public void reload() {
+    _webView.reload();
+  }
+
+  public void destroy() {
+    _webView.destroy();
+  }
+
+  public String getUrl() {
+    return _webView.getUrl();
+  }
+
+  public void executeScript(String script) {
+    _webView.evaluateJavascript(script, null);
+  }
+
   public void setUrl(String url) {
     Map<String, String> requestHeaders = new HashMap<>();
     if (_options.getHeaders() != null) {
       Iterator<String> keys = _options.getHeaders().keys();
       while (keys.hasNext()) {
         String key = keys.next();
-        if (TextUtils.equals(key, "User-Agent")) {
+        if (TextUtils.equals(key.toLowerCase(), "user-agent")) {
           _webView
             .getSettings()
             .setUserAgentString(_options.getHeaders().getString(key));
@@ -108,11 +200,27 @@ public class WebViewDialog extends Dialog {
 
   private void setTitle(String newTitleText) {
     TextView textView = (TextView) _toolbar.findViewById(R.id.titleText);
-    textView.setText(newTitleText);
+    if (_options.getVisibleTitle()) {
+      textView.setText(newTitleText);
+    } else {
+      textView.setText("");
+    }
   }
 
   private void setupToolbar() {
     _toolbar = this.findViewById(R.id.tool_bar);
+    int color = Color.parseColor("#ffffff");
+    try {
+      color = Color.parseColor(_options.getToolbarColor());
+    } catch (IllegalArgumentException e) {
+      // Do nothing
+    }
+    _toolbar.setBackgroundColor(color);
+    _toolbar.findViewById(R.id.backButton).setBackgroundColor(color);
+    _toolbar.findViewById(R.id.forwardButton).setBackgroundColor(color);
+    _toolbar.findViewById(R.id.closeButton).setBackgroundColor(color);
+    _toolbar.findViewById(R.id.reloadButton).setBackgroundColor(color);
+
     if (!TextUtils.isEmpty(_options.getTitle())) {
       this.setTitle(_options.getTitle());
     } else {
@@ -153,12 +261,50 @@ public class WebViewDialog extends Dialog {
       new View.OnClickListener() {
         @Override
         public void onClick(View view) {
-          dismiss();
-          _options.getCallbacks().closeEvent(_webView.getUrl());
+          // if closeModal true then display a native modal to check if the user is sure to close the browser
+          if (_options.getCloseModal()) {
+            new AlertDialog.Builder(_context)
+              .setTitle(_options.getCloseModalTitle())
+              .setMessage(_options.getCloseModalDescription())
+              .setPositiveButton(
+                _options.getCloseModalOk(),
+                new DialogInterface.OnClickListener() {
+                  public void onClick(DialogInterface dialog, int which) {
+                    // Close button clicked, do something
+                    dismiss();
+                    _options.getCallbacks().closeEvent(_webView.getUrl());
+                    _webView.destroy();
+                  }
+                }
+              )
+              .setNegativeButton(_options.getCloseModalCancel(), null)
+              .show();
+          } else {
+            dismiss();
+            _options.getCallbacks().closeEvent(_webView.getUrl());
+            _webView.destroy();
+          }
         }
       }
     );
 
+    if (_options.showArrow()) {
+      closeButton.setBackgroundResource(R.drawable.arrow_forward_enabled);
+    }
+
+    if (_options.getShowReloadButton()) {
+      View reloadButton = _toolbar.findViewById(R.id.reloadButton);
+      reloadButton.setVisibility(View.VISIBLE);
+      reloadButton.setOnClickListener(
+        new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+            _webView.reload();
+          }
+        }
+      );
+    }
+
     if (TextUtils.equals(_options.getToolbarType(), "activity")) {
       _toolbar.findViewById(R.id.forwardButton).setVisibility(View.GONE);
       _toolbar.findViewById(R.id.backButton).setVisibility(View.GONE);
@@ -181,6 +327,19 @@ public class WebViewDialog extends Dialog {
           WebView view,
           WebResourceRequest request
         ) {
+          Context context = view.getContext();
+          String url = request.getUrl().toString();
+
+          if (!url.startsWith("https://") && !url.startsWith("http://")) {
+            try {
+              Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+              intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+              context.startActivity(intent);
+              return true;
+            } catch (ActivityNotFoundException e) {
+              // Do nothing
+            }
+          }
           return false;
         }
 
@@ -198,7 +357,17 @@ public class WebViewDialog extends Dialog {
           } catch (URISyntaxException e) {
             // Do nothing
           }
-          _options.getCallbacks().urlChangeEvent(url);
+        }
+
+        public void doUpdateVisitedHistory(
+          WebView view,
+          String url,
+          boolean isReload
+        ) {
+          if (!isReload) {
+            _options.getCallbacks().urlChangeEvent(url);
+          }
+          super.doUpdateVisitedHistory(view, url, isReload);
         }
 
         @Override
@@ -252,10 +421,11 @@ public class WebViewDialog extends Dialog {
   public void onBackPressed() {
     if (
       _webView.canGoBack() &&
-      TextUtils.equals(_options.getToolbarType(), "navigation")
+      (TextUtils.equals(_options.getToolbarType(), "navigation") ||
+        _options.getActiveNativeNavigationForWebview())
     ) {
       _webView.goBack();
-    } else {
+    } else if (!_options.getDisableGoBackOnNativeApplication()) {
       super.onBackPressed();
     }
   }

package/android/src/main/res/drawable/ic_refresh.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/enable"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>

package/android/src/main/res/layout/tool_bar.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<android.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -15,6 +15,16 @@
         android:layout_gravity="start"
         android:background="#eeeeef"
         android:contentDescription="@string/close_button" />
+    <ImageButton
+        android:id="@+id/reloadButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:background="#eeeeef"
+        android:paddingRight="10dp"
+        android:contentDescription="@string/reload_button"
+        android:src="@drawable/ic_refresh"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/titleText"
@@ -34,7 +44,6 @@
         android:layout_gravity="end"
         android:background="#eeeeef"
         android:contentDescription="@string/forward_button"
-        android:paddingLeft="10dp"
         android:paddingRight="10dp"
         android:src="@drawable/arrow_forward_disabled" />
 
@@ -47,4 +56,4 @@
         android:contentDescription="@string/back_button"
         android:paddingRight="10dp"
         android:src="@drawable/arrow_back_disabled" />
-</androidx.appcompat.widget.Toolbar>
+</android.widget.Toolbar>

package/android/src/main/res/values/strings.xml

@@ -3,6 +3,7 @@
     <string name="title_activity_browser">BrowserActivity</string>
     <string name="title_activity_basic">BasicActivity</string>
     <string name="close_button">Close Button</string>
+    <string name="reload_button">Reload Button</string>
     <string name="back_button">Back Button</string>
     <string name="title">Title</string>
     <string name="forward_button">Forward Button</string>