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

libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.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 100 matching lines @@
     // read and apply current settings
     SharedPreferences prefs = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
     storage = new SharedPrefsStorage(prefs);
 
     // latch is required for async (see `waitForReady()`)
     engineCreated = new CountDownLatch(1);
 
     engine = AdblockEngine.create(
       AdblockEngine.generateAppInfo(context, developmentBuild),
       context.getCacheDir().getAbsolutePath(),
-      true,
-      isAllowedConnectionCallback,
-      null,
-      null,
-      null,
-      null); // `true` as we need element hiding
+      true, // `true` as we need element hiding
+      isAllowedConnectionCallback);
     Log.d(TAG, "Adblock engine created");
-
-    engine.getFilterEngine().setAllowedConnectionType("new_type");
-    String ct = engine.getFilterEngine().getAllowedConnectionType();
 
     AdblockSettings settings = storage.load();
     if (settings != null)
     {
       Log.d(TAG, "Applying saved adblock settings to adblock engine");
       // apply last saved settings to adblock engine
 
-      // all the settings except `enabled`, whitelisted domains list
-      // and allowed connection type are saved by adblock engine itself
+      // all the settings except `enabled` and whitelisted domains list
+      // are saved by adblock engine itself
       engine.setEnabled(settings.isAdblockEnabled());
       engine.setWhitelistedDomains(settings.getWhitelistedDomains());
 
+      // allowed connection type is saved by filter engine but we need to override it
+      // as filter engine can be not created when changing
       String connectionType = (settings.getAllowedConnectionType() != null
        ? settings.getAllowedConnectionType().getValue()
        : null);
       engine.getFilterEngine().setAllowedConnectionType(connectionType);
     }
     else
     {
       Log.w(TAG, "No saved adblock settings");
     }
 
@@ skipping 24 matching lines @@
     }
   }
 
   private void disposeAdblock()
   {
     Log.w(TAG, "Disposing adblock engine");
 
     engine.dispose();
     engine = null;
 
-    // to unlock waiting client in WaitForReady()
+    // to unlock waiting client in waitForReady()
     engineCreated.countDown();
     engineCreated = null;
 
     storage = null;
 
     // callbacks
     this.isAllowedConnectionCallback.dispose();
     this.isAllowedConnectionCallback = null;
   }
 
@@ skipping 39 matching lines @@
    */
   public synchronized void release()
   {
     if (referenceCounter.decrementAndGet() == 0)
     {
       waitForReady();
       disposeAdblock();
     }
   }
 }