From 85047a2b6fcea9175e6bbcb72aa4479d5b89e90b Mon Sep 17 00:00:00 2001 From: AKIRA TAKEDA Date: Tue, 22 Feb 2022 17:43:29 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E8=A7=A3=E9=99=A4=20=E4=B8=80?= =?UTF-8?q?=E9=83=A8=E3=82=B3=E3=83=BC=E3=83=89=E4=BF=AE=E6=AD=A3(var?= =?UTF-8?q?=E2=86=92val=E3=81=AB=E4=BF=AE=E6=AD=A3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/ui/documentweb/DocumentWebClient.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebClient.kt b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebClient.kt index 7f6b1542..319e1fdd 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebClient.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebClient.kt @@ -57,19 +57,19 @@ class DocumentWebViewClient(private val webShare: DocumentWebShare): WebViewClie } super.doUpdateVisitedHistory(view, url, isReload) -/* + // ToDo 400エラーポップアップが発生するためコメントアウト エイトレッドにて改善案検討中 // 非同期にセッション情報取得,cookie設定 - var job = SupervisorJob() - var scope = CoroutineScope(Dispatchers.Default + job) + val job = SupervisorJob() + val scope = CoroutineScope(Dispatchers.Default + job) scope.launch { CookieManager.getInstance().apply { try { - var response = ApiClient.instance.getSession().execute() + val response = ApiClient.instance.getSession().execute() if (response.isSuccessful) { val uri = Uri.parse(url) response.body()!!.session_id?.apply { - var sessionId = response.body()!!.session_id + val sessionId = response.body()!!.session_id setCookie("https://${uri.host}", "JSESSIONID=${sessionId}; Path=/AgileWorks; HttpOnly;Secure;SameSite=None") } } @@ -79,7 +79,7 @@ class DocumentWebViewClient(private val webShare: DocumentWebShare): WebViewClie } } } -*/ + // ネットワーク切断時Viewを表示する必要があるか設定する(URL変更時) url?.let { webShare.presenter.updateDisconnectViewDisplayState(it) } } -- GitLab From 58667ce945671bc088874c2a556964da4398f3e0 Mon Sep 17 00:00:00 2001 From: AKIRA TAKEDA Date: Wed, 23 Mar 2022 17:24:28 +0900 Subject: [PATCH 2/2] =?UTF-8?q?ToDo=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/atled/agileworks/view/ui/documentweb/DocumentWebClient.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebClient.kt b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebClient.kt index 92880816..3e3ad9d2 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebClient.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebClient.kt @@ -58,7 +58,6 @@ class DocumentWebViewClient(private val webShare: DocumentWebShare): WebViewClie super.doUpdateVisitedHistory(view, url, isReload) - // ToDo 400エラーポップアップが発生するためコメントアウト エイトレッドにて改善案検討中 // 非同期にセッション情報取得,cookie設定 val job = SupervisorJob() val scope = CoroutineScope(Dispatchers.Default + job) -- GitLab