mirror of
https://gitlab.futo.org/videostreaming/grayjay.git
synced 2026-05-16 04:52:39 +02:00
Clear cookies after login
This commit is contained in:
@@ -796,6 +796,9 @@ class Settings : FragmentedStorageFileJson() {
|
|||||||
@FormField(R.string.check_disabled_plugin_updates, FieldForm.TOGGLE, R.string.check_disabled_plugin_updates_description, -1)
|
@FormField(R.string.check_disabled_plugin_updates, FieldForm.TOGGLE, R.string.check_disabled_plugin_updates_description, -1)
|
||||||
var checkDisabledPluginsForUpdates: Boolean = false;
|
var checkDisabledPluginsForUpdates: Boolean = false;
|
||||||
|
|
||||||
|
@AdvancedField
|
||||||
|
@FormField(R.string.clear_cookies_after_login, FieldForm.TOGGLE, R.string.clear_cookies_after_login_desc, 0)
|
||||||
|
var clearCookiesAfterLogin: Boolean = true;
|
||||||
@AdvancedField
|
@AdvancedField
|
||||||
@FormField(R.string.clear_cookies_on_logout, FieldForm.TOGGLE, R.string.clears_cookies_when_you_log_out, 0)
|
@FormField(R.string.clear_cookies_on_logout, FieldForm.TOGGLE, R.string.clears_cookies_when_you_log_out, 0)
|
||||||
var clearCookiesOnLogout: Boolean = true;
|
var clearCookiesOnLogout: Boolean = true;
|
||||||
@@ -805,6 +808,12 @@ class Settings : FragmentedStorageFileJson() {
|
|||||||
val cookieManager: CookieManager = CookieManager.getInstance();
|
val cookieManager: CookieManager = CookieManager.getInstance();
|
||||||
cookieManager.removeAllCookies(null);
|
cookieManager.removeAllCookies(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun shouldClearWebviewCookies(): Boolean {
|
||||||
|
return clearCookiesAfterLogin;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*@FormField(R.string.reinstall_embedded_plugins, FieldForm.BUTTON, R.string.also_removes_any_data_related_plugin_like_login_or_settings, 1)
|
/*@FormField(R.string.reinstall_embedded_plugins, FieldForm.BUTTON, R.string.also_removes_any_data_related_plugin_like_login_or_settings, 1)
|
||||||
fun reinstallEmbedded() {
|
fun reinstallEmbedded() {
|
||||||
StateApp.instance.scopeOrNull!!.launch(Dispatchers.IO) {
|
StateApp.instance.scopeOrNull!!.launch(Dispatchers.IO) {
|
||||||
@@ -1048,11 +1057,6 @@ class Settings : FragmentedStorageFileJson() {
|
|||||||
@FormField(R.string.polycentric_local_cache, FieldForm.TOGGLE, R.string.polycentric_local_cache_description, 7)
|
@FormField(R.string.polycentric_local_cache, FieldForm.TOGGLE, R.string.polycentric_local_cache_description, 7)
|
||||||
var polycentricLocalCache: Boolean = true;
|
var polycentricLocalCache: Boolean = true;
|
||||||
var showPrivacyModeDialog: Boolean = true;
|
var showPrivacyModeDialog: Boolean = true;
|
||||||
|
|
||||||
|
|
||||||
fun shouldClearWebviewCookies(): Boolean {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FormField(R.string.gesture_controls, FieldForm.GROUP, -1, 19)
|
@FormField(R.string.gesture_controls, FieldForm.GROUP, -1, 19)
|
||||||
|
|||||||
+2
-2
@@ -309,7 +309,7 @@ class SourceDetailFragment : MainFragment() {
|
|||||||
BigButton(c, context.getString(R.string.logout), context.getString(R.string.sign_out_of_the_platform), R.drawable.ic_logout) {
|
BigButton(c, context.getString(R.string.logout), context.getString(R.string.sign_out_of_the_platform), R.drawable.ic_logout) {
|
||||||
logoutSource();
|
logoutSource();
|
||||||
},
|
},
|
||||||
if(!Settings.instance.other.shouldClearWebviewCookies())
|
if(!Settings.instance.plugins.shouldClearWebviewCookies())
|
||||||
BigButton(c, "Logout without Clear", "Logout but keep the browser cookies.\nThis allows for quick re-logging.", R.drawable.ic_logout) {
|
BigButton(c, "Logout without Clear", "Logout but keep the browser cookies.\nThis allows for quick re-logging.", R.drawable.ic_logout) {
|
||||||
logoutSource(false);
|
logoutSource(false);
|
||||||
}.apply {
|
}.apply {
|
||||||
@@ -520,7 +520,7 @@ class SourceDetailFragment : MainFragment() {
|
|||||||
Logger.e(TAG, "Failed to set plugin authentication (loginSource, loginWarning)", e)
|
Logger.e(TAG, "Failed to set plugin authentication (loginSource, loginWarning)", e)
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
if(Settings.instance.other.shouldClearWebviewCookies()) {
|
if(Settings.instance.plugins.shouldClearWebviewCookies()) {
|
||||||
try {
|
try {
|
||||||
val cookieManager: CookieManager =
|
val cookieManager: CookieManager =
|
||||||
CookieManager.getInstance();
|
CookieManager.getInstance();
|
||||||
|
|||||||
@@ -449,8 +449,9 @@ class StateApp {
|
|||||||
_cacheDirectory?.let { ApiMethods.initCache(it) };
|
_cacheDirectory?.let { ApiMethods.initCache(it) };
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Settings.instance.other.shouldClearWebviewCookies()) {
|
if(Settings.instance.plugins.shouldClearWebviewCookies()) {
|
||||||
try {
|
try {
|
||||||
|
Logger.i(TAG, "Clearing cookies on startup");
|
||||||
val cookieManager: CookieManager =
|
val cookieManager: CookieManager =
|
||||||
CookieManager.getInstance();
|
CookieManager.getInstance();
|
||||||
cookieManager.removeAllCookies(null);
|
cookieManager.removeAllCookies(null);
|
||||||
|
|||||||
@@ -338,6 +338,8 @@
|
|||||||
<string name="clear_the_external_storage_for_download_files">Clear the external storage for download files</string>
|
<string name="clear_the_external_storage_for_download_files">Clear the external storage for download files</string>
|
||||||
<string name="change_the_external_storage_for_download_files">Change the external storage for download files</string>
|
<string name="change_the_external_storage_for_download_files">Change the external storage for download files</string>
|
||||||
<string name="clear_cookies">Clear Cookies</string>
|
<string name="clear_cookies">Clear Cookies</string>
|
||||||
|
<string name="clear_cookies_after_login">Clear Cookies after Login</string>
|
||||||
|
<string name="clear_cookies_after_login_desc">Deletes all cookies on the webview after login, this may be required for certain plugins to function properly.</string>
|
||||||
<string name="clear_cookies_on_logout">Clear Cookies on Logout</string>
|
<string name="clear_cookies_on_logout">Clear Cookies on Logout</string>
|
||||||
<string name="test_background_worker">Test Background Worker</string>
|
<string name="test_background_worker">Test Background Worker</string>
|
||||||
<string name="test_background_worker_description"></string>
|
<string name="test_background_worker_description"></string>
|
||||||
|
|||||||
Reference in New Issue
Block a user