From 84c8ac349d708043e1e908b5031891f0c2d79bac Mon Sep 17 00:00:00 2001 From: kimjjunho Date: Sat, 31 Dec 2022 14:46:44 +0900 Subject: [PATCH 1/3] refactor: SIMT-106 webview setting --- .../com/comit/feature_home/screen/SalaryWebViewScreen.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/feature/feature-home/src/main/java/com/comit/feature_home/screen/SalaryWebViewScreen.kt b/feature/feature-home/src/main/java/com/comit/feature_home/screen/SalaryWebViewScreen.kt index 9287e9f2..2a5c58ce 100644 --- a/feature/feature-home/src/main/java/com/comit/feature_home/screen/SalaryWebViewScreen.kt +++ b/feature/feature-home/src/main/java/com/comit/feature_home/screen/SalaryWebViewScreen.kt @@ -17,6 +17,15 @@ fun SalaryWebViewScreen() { WebView( state = webViewState, + onCreated = { webView -> + with(webView) { + settings.run { + javaScriptEnabled = true + domStorageEnabled = true + javaScriptCanOpenWindowsAutomatically = false + } + } + }, ) } From e3cbba8a10c01f12008a8576a757ebf5915e6d41 Mon Sep 17 00:00:00 2001 From: limsaehyun Date: Sat, 31 Dec 2022 17:00:29 +0900 Subject: [PATCH 2/3] chore: update version --- buildSrc/src/main/java/ProjectProperties.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/ProjectProperties.kt b/buildSrc/src/main/java/ProjectProperties.kt index 16c4f3be..df6224d9 100644 --- a/buildSrc/src/main/java/ProjectProperties.kt +++ b/buildSrc/src/main/java/ProjectProperties.kt @@ -1,8 +1,8 @@ import org.gradle.api.JavaVersion object ProjectProperties{ - const val VERSION_CODE = 4 - const val VERSION_NAME = "1.0.1" + const val VERSION_CODE = 6 + const val VERSION_NAME = "1.0.3" const val APPLICATION_ID = "com.comit.simtong" From f86a8f08f38d24bcccb2794a12ca1401ca8d3348 Mon Sep 17 00:00:00 2001 From: limsaehyun Date: Sat, 31 Dec 2022 17:00:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20home=20Job=20error=20TODO=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/comit/domain/exception/ThrowUnknownException.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/domain/src/main/java/com/comit/domain/exception/ThrowUnknownException.kt b/domain/src/main/java/com/comit/domain/exception/ThrowUnknownException.kt index 3a710d48..f4563436 100644 --- a/domain/src/main/java/com/comit/domain/exception/ThrowUnknownException.kt +++ b/domain/src/main/java/com/comit/domain/exception/ThrowUnknownException.kt @@ -17,6 +17,9 @@ fun throwUnknownException( if (e.message?.contains("NoInternetException") == true) throw NoInternetException() if (e.message?.contains("NoConnectivityException") == true) throw NoInternetException() + // TODO(limsaehyun): 홈 화면에 재접속 할 경우 Job 에러가 발생. 임시로 무시해놓은 상태 처리해야 함 + if (e.message?.contains("Job was cancelled") == true) return + when (e) { is NoInternetException -> throw NoInternetException() is NoConnectivityException -> throw NoInternetException()