@hanwha-ss1/plugin 0.4.1 → 0.4.2

package/android/src/main/java/com/plugin/openbrowser/WebViewActivity.java

@@ -1,18 +1,30 @@
 package com.plugin.openbrowser;
 
 import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
+import android.webkit.CookieManager;
+import android.webkit.ValueCallback;
+import android.webkit.WebChromeClient;
+import android.webkit.WebStorage;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.app.AppCompatActivity;
 
 public class WebViewActivity extends AppCompatActivity {
 
     private WebView webView;
 
+    private ValueCallback mFilePathCallback;;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -27,6 +39,20 @@ public class WebViewActivity extends AppCompatActivity {
         openUrl(url);
     }
 
+    private final ActivityResultLauncher<Intent> startActivityResult = registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(),
+            new ActivityResultCallback<ActivityResult>() {
+                @Override
+                public void onActivityResult(ActivityResult result) {
+                    if (result.getResultCode() == Activity.RESULT_OK) {
+                        mFilePathCallback.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(result.getResultCode(), result.getData()));
+                        mFilePathCallback = null;
+                    } else {
+                        mFilePathCallback.onReceiveValue(null);
+                    }
+                }
+            });
+
     private void initLayout(boolean hasClose, boolean clear) {
         webView = findViewById(R.id.webView);
 
@@ -58,7 +84,41 @@ public class WebViewActivity extends AppCompatActivity {
         webView.getSettings().setDisplayZoomControls(false);
         webView.getSettings().setLoadWithOverviewMode(true);
         webView.getSettings().setUseWideViewPort(true);
-        webView.setWebChromeClient(new ChromeClient((Activity)this));
+//        webView.setWebChromeClient(new ChromeClient((Activity)this));
+        webView.setWebChromeClient(new ChromeClient(this) {
+            @Override
+            public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
+                mFilePathCallback = filePathCallback;
+
+                Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+                intent.addCategory(Intent.CATEGORY_OPENABLE);
+                intent.setType("image/*");
+
+//                startActivityForResult(intent, 0);
+                startActivityResult.launch(intent);
+                return true;
+            }
+        });
+
+        webView.setWebViewClient(new WebViewClient(){
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                if(url.startsWith("close://")){
+                    WebViewActivity.this.finish();
+                } else if(url.startsWith("tel:")){
+                    Intent intent = new Intent(Intent.ACTION_DIAL);
+                    intent.setData(Uri.parse(url));
+                    startActivity(intent);
+                } else if(url.startsWith("sms:")){
+                    Intent intent = new Intent(Intent.ACTION_SENDTO);
+                    intent.setData(Uri.parse(url));
+                    startActivity(intent);
+                }
+                return super.shouldOverrideUrlLoading(view, url);
+            }
+        });
+
+
         webView.setWebViewClient(new WebViewClient(){
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {

package/ios/Plugin/OpenBrowser/ViewController.swift

@@ -39,6 +39,7 @@ class ViewController: UIViewController {
         if clear {
             clearCache()
         }
+        wkWebview.uiDelegate = self
         wkWebview.navigationDelegate = self
         wkWebview.load(URLRequest.init(url: URL(string: url)!))
     }
@@ -69,7 +70,7 @@ class ViewController: UIViewController {
 }
 
 
-extension ViewController: WKNavigationDelegate {
+extension ViewController: WKNavigationDelegate, WKUIDelegate {
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         indicator.stopAnimating()
         webView.isHidden = false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanwha-ss1/plugin",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",