Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/base/java/org/adblockplus/browser/SubscriptionPreferenceCategory.java

Issue 30046562: Issue 7458 - Duplicate entries for EasyPrivacy and Fanboy's Social Blocking List
Patch Set: Created April 16, 2019, 2:06 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 subscriptionContainer.getSubscriptions(enabled); 149 subscriptionContainer.getSubscriptions(enabled);
150 150
151 if (entries.isEmpty()) 151 if (entries.isEmpty())
152 { 152 {
153 this.addPreference(this.createDisabledPreference(titleId, summaryId)); 153 this.addPreference(this.createDisabledPreference(titleId, summaryId));
154 } 154 }
155 else 155 else
156 { 156 {
157 for (SubscriptionContainer.Subscription e : entries) 157 for (SubscriptionContainer.Subscription e : entries)
158 { 158 {
159 this.addPreference(this.createEnabledCheckBox(e)); 159 if(!MoreSubscriptionsPreferenceGroup.BUILTIN_URLS.contains(e.url))
jens 2019/04/17 09:39:22 The white space after the if is missing
160 {
161 this.addPreference(this.createEnabledCheckBox(e));
162 }
160 } 163 }
161 } 164 }
162 } 165 }
163 166
164 private void showProgressDialog() 167 private void showProgressDialog()
165 { 168 {
166 this.progressDialog = new ProgressDialog(this.getContext()); 169 this.progressDialog = new ProgressDialog(this.getContext());
167 this.progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); 170 this.progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
168 this.progressDialog.setMessage(this.getContext().getString(R.string.abb_adbl ocking_waiting)); 171 this.progressDialog.setMessage(this.getContext().getString(R.string.abb_adbl ocking_waiting));
169 this.progressDialog.show(); 172 this.progressDialog.show();
(...skipping 29 matching lines...) Expand all
199 202
200 private class SubscriptionChangeListener implements SubscriptionContainer.Subs criptionListener 203 private class SubscriptionChangeListener implements SubscriptionContainer.Subs criptionListener
201 { 204 {
202 @Override 205 @Override
203 public void onSubscriptionUpdated() 206 public void onSubscriptionUpdated()
204 { 207 {
205 SubscriptionPreferenceCategory.this.refreshEntries(); 208 SubscriptionPreferenceCategory.this.refreshEntries();
206 } 209 }
207 } 210 }
208 } 211 }
OLDNEW

Powered by Google App Engine
This is Rietveld