athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GoogleFragment: Don't attempt to parse cookies if they are null

Browse Source 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2023-07-22 00:37:31 +05:30
parent 9bff289e0a
commit 14fc673b64
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt
View File

@@ -90,12 +90,15 @@ class GoogleFragment : Fragment(R.layout.fragment_google) {
webViewClient = object : WebViewClient() { webViewClient = object : WebViewClient() {
override fun onPageFinished(view: WebView, url: String) { override fun onPageFinished(view: WebView, url: String) {
val cookies = CookieManager.getInstance().getCookie(url) val cookies = CookieManager.getInstance().getCookie(url)
val cookieMap = AC2DMUtil.parseCookieString(cookies) // cookies can be null if there is an error
if (cookieMap.isNotEmpty() && cookieMap[AUTH_TOKEN] != null) { if (cookies != null) {
val oauthToken = cookieMap[AUTH_TOKEN] val cookieMap = AC2DMUtil.parseCookieString(cookies)
evaluateJavascript(JS_SCRIPT) { if (cookieMap.isNotEmpty() && cookieMap[AUTH_TOKEN] != null) {
val email = it.replace("\"".toRegex(), "") val oauthToken = cookieMap[AUTH_TOKEN]
viewModel.buildAuthData(view.context, email, oauthToken) evaluateJavascript(JS_SCRIPT) {
val email = it.replace("\"".toRegex(), "")
viewModel.buildAuthData(view.context, email, oauthToken)
}
} }
} }
} }