libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/SharedPrefsStorage.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/SharedPrefsStorage.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/IsAllowedConnectionCallbackImpl.java ('K') | « libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/IsAllowedConnectionCallbackImpl.java ('k') | libadblockplus-android-webview/src/org/adblockplus/libadblockplus/android/webview/AdblockWebView.java » ('j') | libadblockplus-android/jni/JniFilterEngine.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e3a9b6951b11103c8c3d8c2fe27ca3809d803f5c..a7a49972a7789176f710922b2e961a2a6178d028 100644

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

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

@@ -37,6 +37,7 @@ public class SharedPrefsStorage extends AdblockSettingsStorage

private static final String SETTINGS_SUBSCRIPTION_TITLE_KEY = "title";

private static final String SETTINGS_WL_DOMAINS_KEY = "whitelisted_domains";

private static final String SETTINGS_WL_DOMAIN_KEY = "domain";

+ private static final String SETTINGS_ALLOWED_CONNECTION_TYPE_KEY = "allowed_connection_type";

private SharedPreferences prefs;

private boolean commit = true;

@@ -73,6 +74,8 @@ public class SharedPrefsStorage extends AdblockSettingsStorage

AdblockSettings settings = new AdblockSettings();

settings.setAdblockEnabled(prefs.getBoolean(SETTINGS_ENABLED_KEY, true));

settings.setAcceptableAdsEnabled(prefs.getBoolean(SETTINGS_AA_ENABLED_KEY, true));

+ String connectionType = prefs.getString(SETTINGS_ALLOWED_CONNECTION_TYPE_KEY, null);

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

loadSubscriptions(settings);

loadWhitelistedDomains(settings);

@@ -149,6 +152,11 @@ public class SharedPrefsStorage extends AdblockSettingsStorage

.putBoolean(SETTINGS_ENABLED_KEY, settings.isAdblockEnabled())

.putBoolean(SETTINGS_AA_ENABLED_KEY, settings.isAcceptableAdsEnabled());

+ if (settings.getAllowedConnectionType() != null)

+ {

+ editor.putString(SETTINGS_ALLOWED_CONNECTION_TYPE_KEY, settings.getAllowedConnectionType().getValue());

+ }

saveSubscriptions(settings, editor);

saveWhitelistedDomains(settings, editor);