From 14fc673b643f4e78adc88887b72673f90c93deae Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Sat, 22 Jul 2023 00:37:31 +0530 Subject: [PATCH] GoogleFragment: Don't attempt to parse cookies if they are null Signed-off-by: Aayush Gupta --- .../store/view/ui/account/GoogleFragment.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt b/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt index 96fa595f3..f7513284e 100644 --- a/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt @@ -90,12 +90,15 @@ class GoogleFragment : Fragment(R.layout.fragment_google) { webViewClient = object : WebViewClient() { override fun onPageFinished(view: WebView, url: String) { val cookies = CookieManager.getInstance().getCookie(url) - val cookieMap = AC2DMUtil.parseCookieString(cookies) - if (cookieMap.isNotEmpty() && cookieMap[AUTH_TOKEN] != null) { - val oauthToken = cookieMap[AUTH_TOKEN] - evaluateJavascript(JS_SCRIPT) { - val email = it.replace("\"".toRegex(), "") - viewModel.buildAuthData(view.context, email, oauthToken) + // cookies can be null if there is an error + if (cookies != null) { + val cookieMap = AC2DMUtil.parseCookieString(cookies) + if (cookieMap.isNotEmpty() && cookieMap[AUTH_TOKEN] != null) { + val oauthToken = cookieMap[AUTH_TOKEN] + evaluateJavascript(JS_SCRIPT) { + val email = it.replace("\"".toRegex(), "") + viewModel.buildAuthData(view.context, email, oauthToken) + } } } }