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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.libadblockplus.android.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 
+import org.adblockplus.libadblockplus.IsAllowedConnectionCallback;
+import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;
 import org.adblockplus.libadblockplus.android.AdblockEngine;
 import org.adblockplus.libadblockplus.android.Utils;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * AdblockHelper shared resources
  * (singleton)
  */
 public class AdblockHelper
 {
   private static final String TAG = Utils.getTag(AdblockHelper.class);
 
   /**
    * Suggested preference name
    */
   public static final String PREFERENCE_NAME = "ADBLOCK";
   private static AdblockHelper _instance;
 
   private Context context;
   private boolean developmentBuild;
   private String preferenceName;
   private AdblockEngine engine;
   private AdblockSettingsStorage storage;
   private CountDownLatch engineCreated;
 
+  private IsAllowedConnectionCallback isAllowedConnectionCallback;
+
   /*
     Simple ARC management for AdblockEngine
     Use `retain` and `release`
    */
 
   private AtomicInteger referenceCounter = new AtomicInteger(0);
 
   // singleton
   protected AdblockHelper()
   {
@@ skipping 32 matching lines @@
    */
   public void init(Context context, boolean developmentBuild, String preferenceName)
   {
     this.context = context.getApplicationContext();
     this.developmentBuild = developmentBuild;
     this.preferenceName = preferenceName;
   }
 
   private void createAdblock()
   {
+    this.isAllowedConnectionCallback = new IsAllowedConnectionCallbackImpl(context);
+
     Log.d(TAG, "Creating adblock engine ...");
 
     // 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); // `true` as we need element hiding
-    Log.d(TAG, "AdblockHelper engine created");
+      true,
+      isAllowedConnectionCallback,
+      null,

[Felix Dahlke, 2017/03/24 07:37:24]

How I saw it, there is a version of create where you wouldn't have to pass in
those four `null`s here, or did I miss something?

[anton, 2017/03/24 09:43:10]

Actually you're right and i can just use the version without 4 nulls.
But since i know about upcoming changes (refactoring of the code to use Builder
instead of method with independent argument sets
i did not take care of it too much here. I can change to use method without 4
nulls passed if you insist, do you?

+      null,
+      null,
+      null); // `true` as we need element hiding

[Felix Dahlke, 2017/03/24 07:37:24]

Nit: Seems like this comment should move up now, so it's next to the `true`
being passed.

[anton, 2017/03/24 09:43:10]

Acknowledged.

+    Log.d(TAG, "Adblock engine created");
 
     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` and whitelisted domains are saved by adblock engine itself
+      // all the settings except `enabled`, whitelisted domains list
+      // and allowed connection type are saved by adblock engine itself
       engine.setEnabled(settings.isAdblockEnabled());
       engine.setWhitelistedDomains(settings.getWhitelistedDomains());
+
+      String connectionType = (settings.getAllowedConnectionType() != null
+       ? settings.getAllowedConnectionType().getValue()
+       : null);
+      engine.getFilterEngine().setAllowedConnectionType(connectionType);
     }
     else
     {
       Log.w(TAG, "No saved adblock settings");
     }
 
     // unlock waiting client thread
     engineCreated.countDown();
   }
 
@@ skipping 20 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;
   }
 
   /**
    * Get registered clients count
    * @return registered clients count
    */
   public int getCounter()
   {
     return referenceCounter.get();
   }
@@ skipping 31 matching lines @@
    */
   public synchronized void release()
   {
     if (referenceCounter.decrementAndGet() == 0)
     {
       waitForReady();
       disposeAdblock();
     }
   }
 }