Merge branch 'master' of https://github.com/hogangnono/cordova-plugin-inappbrowser

FE-Roger · FE-Roger · commit 030bac9edadd · 2022-04-27T17:01:17.000+09:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-inappbrowser",
-  "version": "5.0.4-hogangnono",
+  "version": "5.0.9-hogangnono",
   "description": "Cordova InAppBrowser Plugin",
   "types": "./types/index.d.ts",
   "cordova": {
diff --git a/plugin.xml b/plugin.xml
@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="cordova-plugin-inappbrowser"
-      version="5.0.4-hogangnono">
+      version="5.0.9-hogangnono">
 
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>
diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
@@ -18,6 +18,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 package org.apache.cordova.inappbrowser;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.ActivityNotFoundException;
@@ -48,6 +49,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.webkit.CookieManager;
 import android.webkit.HttpAuthHandler;
 import android.webkit.JavascriptInterface;
+import android.webkit.PermissionRequest;
 import android.webkit.SslErrorHandler;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
@@ -70,6 +72,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.LOG;
+import org.apache.cordova.PermissionHelper;
 import org.apache.cordova.PluginManager;
 import org.apache.cordova.PluginResult;
 import org.json.JSONException;
@@ -102,6 +105,7 @@ public class InAppBrowser extends CordovaPlugin {
     private static final String CLEAR_ALL_CACHE = "clearcache";
     private static final String CLEAR_SESSION_CACHE = "clearsessioncache";
     private static final String HARDWARE_BACK_BUTTON = "hardwareback";
+    private static final String TRIGGER_BACK_BUTTON = "triggerback";
     private static final String MEDIA_PLAYBACK_REQUIRES_USER_ACTION = "mediaPlaybackRequiresUserAction";
     private static final String INTENT_PROTOCOL_START = "intent:";
     private static final String INTENT_PROTOCOL_INTENT = "#Intent;";
@@ -110,6 +114,7 @@ public class InAppBrowser extends CordovaPlugin {
     private static final String HOGANGNONO_SCHEME = "hogangnono://";
     private static final String SHOULD_PAUSE = "shouldPauseOnSuspend";
     private static final Boolean DEFAULT_HARDWARE_BACK = true;
+    private static final Boolean DEFAULT_TRIGGER_BACK = false;
     private static final String USER_WIDE_VIEW_PORT = "useWideViewPort";
     private static final String TOOLBAR_COLOR = "toolbarcolor";
     private static final String CLOSE_BUTTON_CAPTION = "closebuttoncaption";
@@ -122,6 +127,8 @@ public class InAppBrowser extends CordovaPlugin {
     private static final String FOOTER_COLOR = "footercolor";
     private static final String BEFORELOAD = "beforeload";
     private static final String FULLSCREEN = "fullscreen";
+    private static final int MY_PERMISSIONS_REQUEST_RECORD_AUDIO = 101;
+    private static final int MY_PERMISSIONS_REQUEST_CAMERA = 102;
 
     private static final List customizableOptions = Arrays.asList(CLOSE_BUTTON_CAPTION, TOOLBAR_COLOR, NAVIGATION_COLOR, CLOSE_BUTTON_COLOR, FOOTER_COLOR);
 
@@ -135,6 +142,7 @@ public class InAppBrowser extends CordovaPlugin {
     private boolean clearAllCache = false;
     private boolean clearSessionCache = false;
     private boolean hadwareBackButton = true;
+    private boolean triggerBackButton = false;
     private boolean mediaPlaybackRequiresUserGesture = false;
     private boolean shouldPauseInAppBrowser = false;
     private boolean useWideViewPort = true;
@@ -153,6 +161,7 @@ public class InAppBrowser extends CordovaPlugin {
     private boolean fullscreen = true;
     private String[] allowedSchemes;
     private InAppBrowserClient currentClient;
+    private PermissionRequest myRequest;
 
     /**
      * Executes the request and returns PluginResult.
@@ -583,6 +592,21 @@ public boolean hardwareBack() {
         return hadwareBackButton;
     }
 
+    /**
+     * Hogangnono - Has the user set the trigger back button to go back
+     * @return boolean
+     */
+    public boolean isTriggerBack() {
+        return triggerBackButton;
+    }
+
+    /**
+     * Hogangnono - Execute javaScript for triggering back button
+     */
+    public void triggerBackButton() {
+        this.inAppWebView.loadUrl("javascript:window.backbutton && window.backbutton()");
+    }
+
     /**
      * Checks to see if it is possible to go forward one page in history, then does so.
      */
@@ -661,6 +685,12 @@ public String showWebPage(final String url, HashMap<String, String> features) {
             } else {
                 hadwareBackButton = DEFAULT_HARDWARE_BACK;
             }
+            String triggerBack = features.get(TRIGGER_BACK_BUTTON);
+            if (triggerBack != null) {
+                triggerBackButton = triggerBack.equals("yes") ? true : false;
+            } else {
+                triggerBackButton = DEFAULT_TRIGGER_BACK;
+            }
             String mediaPlayback = features.get(MEDIA_PLAYBACK_REQUIRES_USER_ACTION);
             if (mediaPlayback != null) {
                 mediaPlaybackRequiresUserGesture = mediaPlayback.equals("yes") ? true : false;
@@ -977,19 +1007,19 @@ public void onClick(View v) {
                         String shareBody = inAppWebView.getUrl();
                         sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, inAppWebView.getUrl());
                         sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, shareBody);
-                        
+
                         cordova.getActivity().startActivity(Intent.createChooser(sharingIntent, "URL 공유"));
                     }
                 });
-                
+
                 RelativeLayout.LayoutParams closeLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
                 closeLayoutParams.addRule(RelativeLayout.RIGHT_OF, shareButtonId);
                 closeButton.setLayoutParams(closeLayoutParams);
 
                 RelativeLayout.LayoutParams shareLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
                 shareLayoutParams.addRule(RelativeLayout.ALIGN_LEFT);
                 shareButton.setLayoutParams(shareLayoutParams);
-                    
+
                 customButtonContainer.addView((View)closeButton);
                 customButtonContainer.addView((View)shareButton);
 
@@ -1017,6 +1047,18 @@ public boolean onShowFileChooser (WebView webView, ValueCallback<Uri[]> filePath
                         cordova.startActivityForResult(InAppBrowser.this, Intent.createChooser(content, "Select File"), FILECHOOSER_REQUESTCODE);
                         return true;
                     }
+
+                    @Override
+                    public void onPermissionRequest(PermissionRequest request) {
+                        myRequest = request;
+                        for (String permission : request.getResources()) {
+                            if (permission.equals("android.webkit.resource.AUDIO_CAPTURE")) {
+                                askForPermission(Manifest.permission.RECORD_AUDIO, MY_PERMISSIONS_REQUEST_RECORD_AUDIO);
+                            } else if (permission.equals("android.webkit.resource.VIDEO_CAPTURE")) {
+                                askForPermission(Manifest.permission.CAMERA, MY_PERMISSIONS_REQUEST_CAMERA);
+                            }
+                        }
+                    }
                 });
                 currentClient = new InAppBrowserClient(thatWebView, edittext, beforeload);
                 inAppWebView.setWebViewClient(currentClient);
@@ -1129,6 +1171,40 @@ public void postMessage(String data) {
         return "";
     }
 
+    /**
+     * WebView에서 권한이 필요할 시에 확인하는 로직
+     *
+     * @param permission 요청하는 권한
+     * @param requestCode 내부적으로 정의한 코드
+     */
+    public void askForPermission(String permission, int requestCode) {
+        if (!PermissionHelper.hasPermission(this, permission)) {
+            PermissionHelper.requestPermission(this, requestCode, permission);
+        } else {
+            myRequest.grant(myRequest.getResources());
+        }
+    }
+
+    /**
+     * 권한 요청 결과가 반환되는 콜백
+     *
+     * @param requestCode 요청시 넣어줬던 코드
+     * @param permissions 요청했던 권한
+     * @param grantResults 권환 획득 여부
+     */
+    public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) throws JSONException {
+        for (int r : grantResults) {
+            if (r == PackageManager.PERMISSION_DENIED) {
+                myRequest.deny();
+                return;
+            }
+        }
+
+        if (requestCode == MY_PERMISSIONS_REQUEST_RECORD_AUDIO || requestCode == MY_PERMISSIONS_REQUEST_CAMERA) {
+            myRequest.grant(myRequest.getResources());
+        }
+    }
+
     /**
      * Create a new plugin success result and send it back to JavaScript
      *
@@ -1339,12 +1415,12 @@ else if (url.startsWith(HOGANGNONO_SCHEME)) {
             else if (url.startsWith(INTENT_PROTOCOL_START)) {
                 final int customUrlStartIndex = INTENT_PROTOCOL_START.length();
                 final int customUrlEndIndex = url.indexOf(INTENT_PROTOCOL_INTENT);
-                
+
                 if (customUrlEndIndex < 0) {
                     return false;
                 } else {
                     final String customUrl = url.substring(customUrlStartIndex, customUrlEndIndex);
-                    
+
                     try {
                         cordova.getActivity().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(customUrl)));
                     } catch (ActivityNotFoundException e) {
diff --git a/src/android/InAppBrowserDialog.java b/src/android/InAppBrowserDialog.java
@@ -50,7 +50,12 @@ public void onBackPressed () {
             if (this.inAppBrowser.hardwareBack() && this.inAppBrowser.canGoBack()) {
                 this.inAppBrowser.goBack();
             }  else {
-                this.inAppBrowser.closeDialog();
+                // Hogangnono - triggerback 옵션이 설정되어 있으면, 웹뷰를 닫지 않고 웹으로 backbutton 함수를 실행시킨다
+                if (this.inAppBrowser.isTriggerBack()) {
+                    this.inAppBrowser.triggerBackButton();
+                } else {
+                    this.inAppBrowser.closeDialog();
+                }
             }
         }
     }
diff --git a/src/ios/CDVWKInAppBrowser.m b/src/ios/CDVWKInAppBrowser.m
diff --git a/src/ios/CDVWKInAppBrowserUIDelegate.m b/src/ios/CDVWKInAppBrowserUIDelegate.m

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cordova-plugin-inappbrowser",`
`3`		`- "version": "5.0.4-hogangnono",`
	`3`	`+ "version": "5.0.9-hogangnono",`
`4`	`4`	`"description": "Cordova InAppBrowser Plugin",`
`5`	`5`	`"types": "./types/index.d.ts",`
`6`	`6`	`"cordova": {`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,12 @@ public void onBackPressed () {`
`50`	`50`	`if (this.inAppBrowser.hardwareBack() && this.inAppBrowser.canGoBack()) {`
`51`	`51`	`this.inAppBrowser.goBack();`
`52`	`52`	`} else {`
`53`		`- this.inAppBrowser.closeDialog();`
	`53`	`+ // Hogangnono - triggerback 옵션이 설정되어 있으면, 웹뷰를 닫지 않고 웹으로 backbutton 함수를 실행시킨다`
	`54`	`+ if (this.inAppBrowser.isTriggerBack()) {`
	`55`	`+ this.inAppBrowser.triggerBackButton();`
	`56`	`+ } else {`
	`57`	`+ this.inAppBrowser.closeDialog();`
	`58`	`+ }`
`54`	`59`	`}`
`55`	`60`	`}`
`56`	`61`	`}`