Issue 4948 - add possibility to not send data depending on connection properties

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

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 19 matching lines @@
 public class SharedPrefsStorage extends AdblockSettingsStorage
 {
   private static final String SETTINGS_ENABLED_KEY = "enabled";
   private static final String SETTINGS_AA_ENABLED_KEY = "aa_enabled";
   private static final String SETTINGS_SUBSCRIPTIONS_KEY = "subscriptions";
   private static final String SETTINGS_SUBSCRIPTION_KEY = "subscription";
   private static final String SETTINGS_SUBSCRIPTION_URL_KEY = "url";
   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;
 
   public SharedPrefsStorage(SharedPreferences prefs)
   {
     this.prefs = prefs;
   }
 
   public boolean isCommit()
@@ skipping 16 matching lines @@
   {
     if (!prefs.contains(SETTINGS_ENABLED_KEY))
     {
       // settings were not saved yet
       return null;
     }
 
     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);
 
     return settings;
   }
 
   private void loadWhitelistedDomains(AdblockSettings settings)
   {
     if (prefs.contains(SETTINGS_WL_DOMAINS_KEY))
@@ skipping 56 matching lines @@
 
   @Override
   public void save(AdblockSettings settings)
   {
     SharedPreferences.Editor editor = prefs
       .edit()
       .clear()
       .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);
 
     if (commit)
     {
       editor.commit();
     }
     else
     {
       // faster but not finished most likely before return
@@ skipping 29 matching lines @@
       {
         Subscription eachSubscription = settings.getSubscriptions().get(i);
 
         // warning: saving `title` and `url` fields only
         editor.putString(getSubscriptionTitleKey(i), eachSubscription.title);
         editor.putString(getSubscriptionURLKey(i), eachSubscription.url);
       }
     }
   }
 }