diff options
| author | Kulanthaivel Palanichamy <kulanthaivel@codeaurora.org> | 2015-07-09 19:52:55 -0700 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-08-28 13:15:46 +0200 |
| commit | 4101f27ca8b79962e6ca8196c72599645aec7bcb (patch) | |
| tree | 2007343166c6093d55198f9b2c753defd53ead2d /src | |
| parent | 9aa5a953cce89e86ad331959d5128ffc17e7b432 (diff) | |
| download | android_packages_apps_Gello-4101f27ca8b79962e6ca8196c72599645aec7bcb.tar.gz android_packages_apps_Gello-4101f27ca8b79962e6ca8196c72599645aec7bcb.tar.bz2 android_packages_apps_Gello-4101f27ca8b79962e6ca8196c72599645aec7bcb.zip | |
Integration changes for WebRefiner0.93
Change-Id: I895c95daeb0bd7b5f9967588304eb7e725ceae85
Diffstat (limited to 'src')
3 files changed, 8 insertions, 13 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 753b1c85..04da119d 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -139,8 +139,7 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, // Intialize Web Refiner only once final WebRefiner refiner = WebRefiner.getInstance(); if (refiner != null) { - refiner.setRulesEnabled(WebRefiner.CATEGORY_ALL, - PermissionsServiceFactory.getDefaultPermissions( + refiner.setDefaultPermission(PermissionsServiceFactory.getDefaultPermissions( PermissionsServiceFactory.PermissionType.WEBREFINER)); PermissionsServiceFactory.getPermissionsService( @@ -163,13 +162,13 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, } } if (!allowList.isEmpty()) { - refiner.enableRulesForDomains(WebRefiner.CATEGORY_ALL, - allowList.toArray(new String[allowList.size()])); + refiner.setPermissionForOrigins( + allowList.toArray(new String[allowList.size()]), true); } if (!blockList.isEmpty()) { - refiner.disableRulesForDomains(WebRefiner.CATEGORY_ALL, - blockList.toArray(new String[blockList.size()])); + refiner.setPermissionForOrigins( + blockList.toArray(new String[blockList.size()]), false); } } } diff --git a/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java b/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java index 10595074..9d74329c 100644 --- a/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java +++ b/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java @@ -553,7 +553,7 @@ public class SiteSpecificPreferencesFragment extends SWEPreferenceFragment if (refiner != null) { String[] origins = new String[1]; origins[0] = mOriginInfo.getOrigin(); - refiner.useGlobalRulesForDomains(origins); + refiner.useDefaultPermissionForOrigins(origins); } finish(); @@ -660,11 +660,7 @@ public class SiteSpecificPreferencesFragment extends SWEPreferenceFragment boolean disable = (boolean) objValue; String[] origins = new String[1]; origins[0] = mOriginInfo.getOrigin(); - if (disable) { - refiner.disableRulesForDomains(WebRefiner.CATEGORY_ALL, origins); - } else { - refiner.enableRulesForDomains(WebRefiner.CATEGORY_ALL, origins); - } + refiner.setPermissionForOrigins(origins, !disable); } updateTwoStatePreference(pref, PermissionsServiceFactory.PermissionType.WEBREFINER, (boolean)objValue); diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java index 96ed983d..f447ced9 100644 --- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java +++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java @@ -175,7 +175,7 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList WebRefiner refiner = WebRefiner.getInstance(); if (refiner != null) { - refiner.useGlobalRulesForDomains(originArray); + refiner.useDefaultPermissionForOrigins(originArray); } } } |