Clear cookies before opening web views (#2836)

Author: DaVinci9196

play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/WebViewHelper.kt

@@ -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
@@ -110,7 +112,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)

play-services-core/src/main/kotlin/org/microg/gms/auth/consent/ConsentSignInActivity.kt

@@ -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
@@ -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)
             }
@@ -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()
+        }
+    }
 }

vending-app/src/main/java/org/microg/vending/billing/ui/WebViewHelper.kt

@@ -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
@@ -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)