Merge pull request #9 from hogangnono/feature/HGNN-7715

[HGNN-7715] [호갱노노/Android] in-app 브라우저 customscheme 대응

Author: zigbang-rad

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-inappbrowser",
-  "version": "5.0.17-hogangnono",
+  "version": "5.0.20-hogangnono",
   "description": "Cordova InAppBrowser Plugin",
   "types": "./types/index.d.ts",
   "cordova": {
@@ -56,4 +56,4 @@
   "devDependencies": {
     "@cordova/eslint-config": "^3.0.0"
   }
-}
+}

package.json

@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="cordova-plugin-inappbrowser"
-      version="5.0.17-hogangnono">
+      version="5.0.20-hogangnono">
 
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>

plugin.xml

@@ -127,10 +127,11 @@ 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 String ALLOWEDSCHEMES = "allowedschemes";
     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);
+    private static final List customizableOptions = Arrays.asList(CLOSE_BUTTON_CAPTION, TOOLBAR_COLOR, NAVIGATION_COLOR, CLOSE_BUTTON_COLOR, FOOTER_COLOR, ALLOWEDSCHEMES);
 
     private InAppBrowserDialog dialog;
     private WebView inAppWebView;
@@ -181,6 +182,11 @@ public boolean execute(String action, CordovaArgs args, final CallbackContext ca
             }
             final String target = t;
             final HashMap<String, String> features = parseFeature(args.optString(2));
+            final String customscheme = features.get(ALLOWEDSCHEMES);
+            if (customscheme != null) {
+                LOG.d(LOG_TAG, "customscheme = " + customscheme);
+                allowedSchemes = customscheme.split("/");
+            }
 
             LOG.d(LOG_TAG, "target = " + target);
 
@@ -1029,6 +1035,7 @@ public void onClick(View v) {
 
                 // WebView
                 inAppWebView = new WebView(cordova.getActivity());
+                inAppWebView.setBackgroundColor(Color.WHITE);
                 inAppWebView.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
                 inAppWebView.setId(Integer.valueOf(6));
                 // File Chooser Implemented ChromeClient
@@ -1443,29 +1450,37 @@ else if (url.startsWith(INTENT_PROTOCOL_START)) {
             }
             // Test for whitelisted custom scheme names like mycoolapp:// or twitteroauthresponse:// (Twitter Oauth Response)
             else if (!url.startsWith("http:") && !url.startsWith("https:") && url.matches("^[A-Za-z0-9+.-]*://.*?$")) {
-                if (allowedSchemes == null) {
-                    String allowed = preferences.getString("AllowedSchemes", null);
-                    if(allowed != null) {
-                        allowedSchemes = allowed.split(",");
-                    }
-                }
                 if (allowedSchemes != null) {
-                    for (String scheme : allowedSchemes) {
-                        if (url.startsWith(scheme)) {
-                            try {
-                                JSONObject obj = new JSONObject();
-                                obj.put("type", "customscheme");
-                                obj.put("url", url);
-                                sendUpdate(obj, true);
+                    try {
+                        for (String scheme : allowedSchemes) {
+                            if (scheme != null && (scheme.equals("all") || url.startsWith(scheme))) {
+                                LOG.d(LOG_TAG, "execute deeplink [" + url + "]");
+                                try {
+                                    cordova.getActivity().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+                                    JSONObject obj = new JSONObject();
+                                    obj.put("type", "customscheme");
+                                    obj.put("url", url);
+                                    sendUpdate(obj, true);
+                                } catch (ActivityNotFoundException e) {
+                                    LOG.e(LOG_TAG, "not installed deeplink app [" + url + "] : " + e.toString());
+                                } catch (JSONException ex) {
+                                    LOG.e(LOG_TAG, "Custom Scheme URI passed in has caused a JSON error.");
+                                }
                                 override = true;
-                            } catch (JSONException ex) {
-                                LOG.e(LOG_TAG, "Custom Scheme URI passed in has caused a JSON error.");
+                                break;
                             }
                         }
+                        if (!override) {
+                            LOG.e(LOG_TAG, "not allowed this scheme [" + url + "]");
+                        }
+                    } catch (NullPointerException e) {
+                        LOG.e(LOG_TAG, "scheme is null?! : " + e.toString());
                     }
+                } else {
+                    LOG.e(LOG_TAG, "no allowedSchemes");
                 }
+                return true;
             }
-
             if (useBeforeload) {
                 this.waitForBeforeload = true;
             }