mixed content mode fixed

Author: ehowlsla

README.md

@@ -32,7 +32,7 @@ allprojects {
 ```gradle
 dependencies {
     ...
-    implementation 'com.github.bootpay:client_android_java:2.0.126'
+    implementation 'com.github.bootpay:client_android_java:2.0.127'
 }
 ```
 

bootpay/src/main/java/kr/co/bootpay/BootpayWebView.kt

@@ -303,9 +303,11 @@ internal class BootpayWebView @JvmOverloads constructor(context: Context, attrs:
         setWebChromeClient(Client())
         addJavascriptInterface(AndroidBridge(), "Android")
         CookieManager.getInstance().setAcceptCookie(true)
+
         settings.apply {
             if (Build.VERSION.SDK_INT >= 21) {
-                mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE
+                mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
+                CookieManager.getInstance().setAcceptCookie(true)
                 CookieManager.getInstance().setAcceptThirdPartyCookies(this@BootpayWebView, true)
             }
             javaScriptEnabled = true

bootpay/src/main/java/kr/co/bootpay/analytics/BootpayAnalyticsPresenter.kt

@@ -17,7 +17,7 @@ internal class BootpayAnalyticsPresenter(context: Context) {
     private val rest: RestService by lazy { RestService(context) }
     private val executor: Scheduler by lazy { Schedulers.from(Executors.newCachedThreadPool()) }
 
-    private val ver = "2.0.126"
+    private val ver = "2.0.127"
 
     fun login(
             id: String?,

sample/sample.iml

@@ -100,6 +100,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />

sample/src/main/java/bootpay/co/kr/samplepayment/NativeActivity.java

@@ -60,7 +60,7 @@ public void onClick_request(View v) {
 //        결제호출
         Bootpay.init(getFragmentManager())
                 .setApplicationId("5b14c0ffb6d49c40cda92c4e") // 해당 프로젝트(안드로이드)의 application id 값
-                .setPG(PG.DANAL) // 결제할 PG 사
+                .setPG(PG.INICIS) // 결제할 PG 사
                 .setUserPhone("010-1234-5678") // 구매자 전화번호
                 .setMethod(Method.CARD) // 결제수단
                 .setName("맥\"북프로's 임다") // 결제할 상품명

sample/src/main/java/bootpay/co/kr/samplepayment/WebAppActivity.java

@@ -18,7 +18,6 @@
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-
 import java.net.URISyntaxException;