chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java - Issue 1867553002: Fix crash in SingleWebsitePreferences when clearing cookies.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

Issue 1867553002: Fix crash in SingleWebsitePreferences when clearing cookies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address feedback Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

index e47011cd9022fe9e4580e02d0db78ad1bcafa116..0183ce3b3409261187fe8233b66fec392fcc28ac 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

@@ -23,6 +23,7 @@ import android.widget.ListAdapter;

import android.widget.ListView;

import org.chromium.base.ApiCompatibilityUtils;

+import org.chromium.base.VisibleForTesting;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.ContentSettingsType;

import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;

@@ -631,7 +632,11 @@ public class SingleWebsitePreferences extends PreferenceFragment

return true;

}

- private void resetSite() {

+ /**

+ * Resets the current site, clearing all permissions and storage used (inc. cookies).

+ */

+ @VisibleForTesting

+ protected void resetSite() {

if (getActivity() == null) return;

// Clear the screen.

// TODO(mvanouwerkerk): Refactor this class so that it does not depend on the screen state

@@ -646,7 +651,7 @@ public class SingleWebsitePreferences extends PreferenceFragment

// Clear the permissions.

mSite.setCameraPermission(ContentSetting.DEFAULT);

mSite.setCookiePermission(ContentSetting.DEFAULT);

- WebsitePreferenceBridge.nativeClearCookieData(mSite.getAddress().getOrigin());

+ WebsitePreferenceBridge.nativeClearCookieData(mSite.getAddress().getTitle());

mSite.setFullscreenPermission(ContentSetting.DEFAULT);

mSite.setGeolocationPermission(ContentSetting.DEFAULT);

mSite.setJavaScriptPermission(ContentSetting.DEFAULT);