libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockSettingsStorage.java - Issue 29379647: Issue 4948 - add possibility to not send data depending on connection properties

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: libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockSettingsStorage.java

Issue 29379647: Issue 4948 - add possibility to not send data depending on connection properties (Closed)

Patch Set: updated to 4931 code review patch set 3 and later Created March 21, 2017, 10:28 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

« libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java ('K') | « libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockSettings.java ('k') | libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/ConnectionType.java » ('j') | libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/ConnectionType.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockSettingsStorage.java

diff --git a/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockSettingsStorage.java b/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockSettingsStorage.java

index dd3cc1f334c36c86fb7d9c3ed2585933cd74d64e..77387929b9983f7ef521792fccaaa90f4291d6d8 100644

--- a/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockSettingsStorage.java

+++ b/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockSettingsStorage.java

@@ -57,6 +57,8 @@ public abstract class AdblockSettingsStorage

// read actual values from adblock engine

settings.setAdblockEnabled(adblockEngine.isEnabled());

settings.setAcceptableAdsEnabled(adblockEngine.isAcceptableAdsEnabled());

+ String allowedConnectionTypeValue = adblockEngine.getFilterEngine().getAllowedConnectionType();

+ settings.setAllowedConnectionType(ConnectionType.findByValue(allowedConnectionTypeValue));

// we need to filter out exceptions subscription to show languages subscriptions only

Subscription[] listedSubscriptions = adblockEngine.getListedSubscriptions();