Skip to content

Clear cookies before opening web views #2836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mar-v-in merged 4 commits into from
Apr 2, 2025
Merged

Clear cookies before opening web views #2836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb9b631
fix invalid request
DaVinci9196 Mar 21, 2025
60f9055
Add code compatibility under LOLLIPOP version
DaVinci9196 Mar 25, 2025
237e56b
Optimizing the code
DaVinci9196 Mar 31, 2025
6babfb0
Optimizing the code II
DaVinci9196 Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/WebViewHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ package org.microg.gms.accountsettings.ui
import android.content.Intent
import android.content.Intent.URI_INTENT_SCHEME
import android.net.Uri
import android.os.Build.VERSION.SDK_INT
import android.util.Log
import android.view.View
import android.webkit.CookieManager
import android.webkit.WebResourceRequest
import android.webkit.WebSettings
import android.webkit.WebView
Expand Down Expand Up @@ -109,7 +111,14 @@ class WebViewHelper(private val activity: AppCompatActivity, private val webView
}
Log.d(TAG, "Opening $authUrl")
webView.post {
loadWebViewUrl(authUrl)
if (SDK_INT >= 21) {
CookieManager.getInstance().removeAllCookies {
loadWebViewUrl(authUrl)
}
} else {
CookieManager.getInstance().removeAllCookie()
loadWebViewUrl(authUrl)
}
}
} catch (e: Exception) {
Log.w(TAG, "Failed to get weblogin auth.", e)
Expand Down
13 changes: 11 additions & 2 deletions play-services-core/src/main/kotlin/org/microg/gms/auth/consent/ConsentSignInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package org.microg.gms.auth.consent
import android.annotation.SuppressLint
import android.app.Activity
import android.graphics.Bitmap
import android.os.Build
import android.os.Build.VERSION.SDK_INT
import android.os.Bundle
import android.os.Message
import android.os.Messenger
Expand Down Expand Up @@ -92,7 +92,7 @@ class ConsentSignInActivity : Activity() {

private fun initCookieManager() {
val cookieManager = CookieManager.getInstance()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
if (SDK_INT >= 21) {
cookieManager.removeAllCookies { _ ->
setCookiesAndLoadUrl(consentUrl!!, cookieManager)
}
Expand Down Expand Up @@ -163,4 +163,13 @@ class ConsentSignInActivity : Activity() {
Log.d(TAG, "consent showView: ")
}
}

override fun onStop() {
super.onStop()
if (SDK_INT >= 21) {
CookieManager.getInstance().removeAllCookies(null)
} else {
CookieManager.getInstance().removeAllCookie()
}
}
}
14 changes: 12 additions & 2 deletions vending-app/src/main/java/org/microg/vending/billing/ui/WebViewHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ package org.microg.vending.billing.ui

import android.accounts.Account
import android.accounts.AccountManager
import android.content.Intent
import android.net.Uri
import android.os.Build.VERSION.SDK_INT
import android.util.Log
import android.view.View
import android.webkit.CookieManager
import android.webkit.WebResourceRequest
import android.webkit.WebSettings
import android.webkit.WebView
Expand Down Expand Up @@ -95,7 +96,16 @@ class WebViewHelper(
}
if (Log.isLoggable(TAG, Log.DEBUG)) Log.d(TAG, "Opening $authUrl")
webView.post {
loadWebViewUrl(authUrl)
if (SDK_INT >= 21) {
CookieManager.getInstance().removeAllCookies {
if (Log.isLoggable(TAG, Log.DEBUG)) Log.d(TAG, "Cookies removed")
loadWebViewUrl(authUrl)
}
} else {
CookieManager.getInstance().removeAllCookie()
loadWebViewUrl(authUrl)
}

}
} catch (e: Exception) {
if (Log.isLoggable(TAG, Log.DEBUG)) Log.d(TAG, "Failed to get weblogin auth.", e)
Expand Down