adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/MoreBlockingPreferenceCategory.java - Issue 29760569: Issue 6238 - Download/store notifications.json

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

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

Issue 29760569: Issue 6238 - Download/store notifications.json (Closed)

Patch Set: Created May 15, 2018, 9:57 a.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 | « adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/MainPreferences.java ('k') | adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/DownloadJobService.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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())

{