From 5d5c3ebe9e12aed7ecdf8d05033c9cced2b074bf Mon Sep 17 00:00:00 2001 From: AKIRA TAKEDA Date: Fri, 25 Feb 2022 14:28:47 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=83=96=E9=81=B8=E6=8A=9E=E6=99=82?= =?UTF-8?q?=E3=80=81=E5=88=9D=E6=9C=9FURL=E3=82=92=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=20=E4=B8=8D=E8=A6=81import=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/ui/documentweb/DocumentWebFragment.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt index 16ddcf38..d86da916 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt @@ -4,7 +4,6 @@ import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.net.ConnectivityManager -import android.net.Network import android.net.Uri import android.os.Bundle import android.util.Log @@ -17,11 +16,7 @@ import android.widget.TextView import android.widget.Toolbar import androidx.core.view.GestureDetectorCompat import androidx.fragment.app.Fragment -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.ViewTreeLifecycleOwner -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import jp.atled.agileworks.R import jp.atled.agileworks.AwApp import jp.atled.agileworks.databinding.FragmentWebviewDetailBinding @@ -61,7 +56,7 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter { webShare = DocumentWebShare(this, DocumentWebDownloader(this, RC_CHOOSE_FILE, RC_SAVE_FILE)) arguments?.let { connectUrl = DocumentWebFragmentArgs.fromBundle(it).url - getSessionAndSetupWebView(view, connectUrl!!, lastUrl,sessionId == null) + getSessionAndSetupWebView(view, connectUrl!!, lastUrl,true) } // セットワーク切断状態で、webview デフォルトページ表示時に透明view表示 checkSetNetworkState() @@ -205,9 +200,7 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter { private fun getSessionAndSetupWebView(view: View, url: String, lasturl: String?, urlLoading: Boolean) { CookieManager.getInstance().apply { setAcceptCookie(true) - if (webview == null) { - webview = WebView(requireActivity()) - } + webview = WebView(requireActivity()) view.findViewById(R.id.webviewLelativeLayout)?.let { it.addView(webview, 0, RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.FILL_PARENT)) } -- GitLab