Clear cookies on startup & after login

app/src/main/java/com/futo/platformplayer/Settings.kt

@@ -1047,8 +1047,12 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.polycentric_local_cache, FieldForm.TOGGLE, R.string.polycentric_local_cache_description, 7)
         var polycentricLocalCache: Boolean = true;
-
         var showPrivacyModeDialog: Boolean = true;
+
+
+        fun shouldClearWebviewCookies(): Boolean {
+            return true;
+        }
     }
 
     @FormField(R.string.gesture_controls, FieldForm.GROUP, -1, 19)

app/src/main/java/com/futo/platformplayer/engine/packages/PackageBrowser.kt

@@ -5,10 +5,12 @@ import android.webkit.ConsoleMessage
 import android.webkit.JavascriptInterface
 import android.webkit.ValueCallback
 import android.webkit.WebChromeClient
+import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.collection.emptyLongSet
 import com.caoccao.javet.annotations.V8Function
+import com.caoccao.javet.utils.JavetResourceUtils
 import com.caoccao.javet.values.reference.V8ValueFunction
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
@@ -64,6 +66,10 @@ class PackageBrowser: V8Package {
                         _readySemaphore = null;
                         Logger.i("PackageBrowser", "Browser loaded");
                     }
+
+                    override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+                        return false;
+                    }
                 }
                 _browser?.webChromeClient = object : WebChromeClient() {
                     override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
@@ -89,7 +95,9 @@ class PackageBrowser: V8Package {
     }
     @V8Function
     fun deinitialize() {
-        _browser?.destroy();
+        StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+            _browser?.destroy();
+        }
         _browser = null;
     }
 
@@ -140,7 +148,11 @@ class PackageBrowser: V8Package {
         if(callbackId != null && callback != null) {
             synchronized(_callbacks) {
                 _callbacks.put(callbackId, {
-                    funcClone?.callVoid(null, arrayOf(it));
+                    _plugin.busy {
+                        funcClone?.callVoid(null, arrayOf(it));
+                    }
+                    if (!_plugin.isStopped)
+                        JavetResourceUtils.safeClose(funcClone);
                 });
             }
         }
@@ -168,7 +180,14 @@ class PackageBrowser: V8Package {
                 browser.evaluateJavascript(js, object : ValueCallback<String> {
                     override fun onReceiveValue(value: String?) {
                         Logger.i("PackageBrowser", "Browser run returned: " + (value ?: ""));
-                        funcClone?.callVoid(null, arrayOf(value));
+                        StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                            Logger.i("PackageBrowser", "Invoking V8 with result (${funcClone != null})");
+                            _plugin.busy {
+                                funcClone?.callVoid(null, arrayOf(value));
+                            }
+                            if (!_plugin.isStopped)
+                                JavetResourceUtils.safeClose(funcClone);
+                        }
                     }
                 })
             }
@@ -184,8 +203,11 @@ class PackageBrowser: V8Package {
         fun callback(id: String, result: String) {
             Logger.i("PackageBrowser", "Browser Callback [${id}]: ${result}");
             val callback = synchronized(pack._callbacks) { pack._callbacks.remove(id); };
-            if(callback != null)
-                callback.invoke(result);
+            if(callback != null) {
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
+                    callback.invoke(result);
+                }
+            }
         }
 
         @JavascriptInterface

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt

@@ -309,13 +309,14 @@ class SourceDetailFragment : MainFragment() {
                         BigButton(c, context.getString(R.string.logout), context.getString(R.string.sign_out_of_the_platform), R.drawable.ic_logout) {
                             logoutSource();
                         },
+                        if(!Settings.instance.other.shouldClearWebviewCookies())
                         BigButton(c, "Logout without Clear", "Logout but keep the browser cookies.\nThis allows for quick re-logging.", R.drawable.ic_logout) {
                             logoutSource(false);
                         }.apply {
                             this.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply {
                                 setMargins(0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics).toInt(), 0, 0);
                             };
-                        }
+                        } else null
                     )
                 );
 
@@ -518,6 +519,17 @@ class SourceDetailFragment : MainFragment() {
                                 }
                                 Logger.e(TAG, "Failed to set plugin authentication (loginSource, loginWarning)", e)
                             }
+                            finally {
+                                if(Settings.instance.other.shouldClearWebviewCookies()) {
+                                    try {
+                                        val cookieManager: CookieManager =
+                                            CookieManager.getInstance();
+                                        cookieManager.removeAllCookies(null);
+                                    } catch (ex: Throwable) {
+                                        Logger.e(TAG, "Failed to clear cookies", ex);
+                                    }
+                                }
+                            }
                         };
                     }, UIDialogs.ActionStyle.PRIMARY))
             }

app/src/main/java/com/futo/platformplayer/states/StateApp.kt

@@ -448,6 +448,8 @@ class StateApp {
             _cacheDirectory?.let { ApiMethods.initCache(it) };
         }
 
+
+
         Logger.i(TAG, "MainApp Starting: Initializing [ModerationsManager]");
         ModerationsManager.initialize(context);