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

Unified Diff: adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/MoreBlockingPreferenceCategory.java

Issue 29722618: Issue 6238 - Download/store notifications.json (Closed)
Patch Set: Created March 14, 2018, 1:34 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/Engine.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/MoreBlockingPreferenceCategory.java
===================================================================
--- a/adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/MoreBlockingPreferenceCategory.java
+++ b/adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/MoreBlockingPreferenceCategory.java
@@ -26,16 +26,17 @@ import java.util.List;
import java.util.Map;
import org.adblockplus.sbrowser.contentblocker.engine.DefaultSubscriptionInfo;
import org.adblockplus.sbrowser.contentblocker.engine.Engine;
import org.adblockplus.sbrowser.contentblocker.engine.EngineManager;
import org.adblockplus.sbrowser.contentblocker.engine.SubscriptionInfo;
import org.adblockplus.adblockplussbrowser.R;
import org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPreference;
+import org.adblockplus.sbrowser.contentblocker.util.SubscriptionUtils;
import android.content.Context;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.Preference.OnPreferenceChangeListener;
import android.text.format.DateUtils;
import android.util.AttributeSet;
import android.util.Log;
@@ -209,16 +210,21 @@ public class MoreBlockingPreferenceCateg
return moreBlockingPreferenceSubscriptions;
}
for (SubscriptionInfo sub : engine.getListedSubscriptions())
{
final DefaultSubscriptionInfo info = engine.getDefaultSubscriptionInfoForUrl(sub.getUrl());
Integer resInt = URL_TO_RES_ID_MAP.get(sub.getUrl());
+ if (SubscriptionUtils.isNotificationSubscription(sub.getId()))
+ {
+ continue;
+ }
+
if (sub.getType() == SubscriptionInfo.Type.CUSTOM)
{
moreBlockingPreferenceSubscriptions.add(sub);
continue;
}
if (info != null && !info.isComplete() && sub.isEnabled())
{
« no previous file with comments | « no previous file | adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/Engine.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld