Merge pull request #58 from iamport/fix/disable-sdk-web-debugging

fix : remove WebView.setWebContentsDebuggingEnabled in sdk
iamport · Mar 15, 2022 · 95509d0 · 95509d0
2 parents ac36a38 + ed42aba
commit 95509d0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/app/src/main/java/com/iamport/sampleapp/ui/MainActivity.kt b/app/src/main/java/com/iamport/sampleapp/ui/MainActivity.kt
@@ -1,11 +1,14 @@
 package com.iamport.sampleapp.ui
 
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
+import android.webkit.WebView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import com.iamport.sampleapp.BuildConfig
 import com.iamport.sampleapp.R
 import com.iamport.sampleapp.ViewModel
 import com.iamport.sdk.domain.core.Iamport
@@ -24,6 +27,11 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.main_activity)
         Iamport.init(this)
 
+        // SDK 웹 디버깅을 위해 추가
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG)
+        }
+
         // use fragment
 //        replaceFragment(paymentFragment)
         supportFragmentManager.beginTransaction()

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -1,7 +1,7 @@
 // 디펜던시 업데이트 확인 ./gradlew dependencyUpdates -Drevision=release
 object Versions {
-    const val versionCode = 220120001 // yymmdd000
-    const val versionName = "1.3.2"  // https://www.notion.so/chaifinance/QA-Process-d1a4be396337493b81c6e85fff2d5cd6
+    const val versionCode = 220315001 // yymmdd000
+    const val versionName = "1.3.4"  // https://www.notion.so/chaifinance/QA-Process-d1a4be396337493b81c6e85fff2d5cd6
 
     const val gradle_versions_plugin = "0.39.0"
     const val gradle_version = "4.1.1"

diff --git a/sdk/src/main/java/com/iamport/sdk/presentation/activity/BaseMain.kt b/sdk/src/main/java/com/iamport/sdk/presentation/activity/BaseMain.kt
@@ -28,10 +28,6 @@ interface BaseMain {
         webView.settings.apply {
             javaScriptEnabled = true
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG)
-            }
-
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
                 val cookieManager = CookieManager.getInstance()