Merge pull request #7 from hogangnono/feature/customscheme

[HGNN-7039] 광고 BM 배너 관련 안드로이드 앱 작업

Author: zbJinu

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-inappbrowser",
-  "version": "5.0.15-hogangnono",
+  "version": "5.0.16-hogangnono",
   "description": "Cordova InAppBrowser Plugin",
   "types": "./types/index.d.ts",
   "cordova": {

plugin.xml

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

src/android/InAppBrowser.java

@@ -380,6 +380,11 @@ public void onResume(boolean multitasking) {
         if (shouldPauseInAppBrowser) {
             inAppWebView.onResume();
         }
+
+        // onelink를 통해 이동 후, 앱에 재 진입 시, 기존 페이지로 전환
+        if(edittext.getText().toString().contains("onelink.me")) {
+            goBack();
+        }
     }
 
     /**
@@ -1090,6 +1095,11 @@ public void postMessage(String data) {
 
                 if (overrideUserAgent != null) {
                     settings.setUserAgentString(overrideUserAgent);
+                }else{
+                    //onelink에서 customscheme가 아닌 intent://사용하기 위해서 UA에서 wv를 제거
+                   String ua =  settings.getUserAgentString();
+                   String newUA = ua.replace("; wv","");
+                   settings.setUserAgentString(newUA);
                 }
                 if (appendUserAgent != null) {
                     settings.setUserAgentString(settings.getUserAgentString() + appendUserAgent);
@@ -1412,28 +1422,24 @@ else if (url.startsWith(HOGANGNONO_SCHEME)) {
             }
             // Supports Intent:// scheme. It usually used on above 4 version.
             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);
-
+                // intent:// 실행코드 변경
+                try {
+                    Intent intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
                     try {
-                        cordova.getActivity().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(customUrl)));
-                    } catch (ActivityNotFoundException e) {
-                        if (url.contains("kakaolink://send")) {
-                            cordova.getActivity().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(GOOGLE_PLAY_STORE_PREFIX + "com.kakao.talk")));
-                            return true;
+                        Uri uri = Uri.parse(intent.getDataString());
+                        cordova.getActivity().startActivity(new Intent(Intent.ACTION_VIEW, uri));
+                    } catch(Exception e) {
+                        LOG.e(LOG_TAG, "Error startActivity Intent " + url + ": " + e.toString());
+                        String fallbackUrl = intent.getStringExtra("browser_fallback_url");
+                        if(fallbackUrl != null) {
+                            LOG.d(LOG_TAG, "FallbackUrl : " + fallbackUrl);
+                            cordova.getActivity().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(fallbackUrl)));
                         }
-                        final int packageStartIndex = customUrlEndIndex + INTENT_PROTOCOL_INTENT.length();
-                        final int packageEndIndex = url.indexOf(INTENT_PROTOCOL_END);
-                        final String packageName = url.substring(packageStartIndex, packageEndIndex < 0 ? url.length() : packageEndIndex).replace("package=", "");
-                        cordova.getActivity().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(GOOGLE_PLAY_STORE_PREFIX + packageName)));
                     }
-                    return true;
+                } catch(Exception e) {
+                    LOG.e(LOG_TAG, "Error parseUri " + url + ": " + e.toString());
                 }
+                return true;
             }
             // 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+.-]*://.*?$")) {