Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8

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

Index: libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java
diff --git a/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java b/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java
index d484608e902a89f27495953ac0ab5b4c5ddf394b..41592ace84661ace8e97c007e5a9caec66dc8e37 100644
--- a/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java
+++ b/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java
@@ -60,8 +60,6 @@ public class AdblockHelper
   private AdblockSettingsStorage storage;
   private CountDownLatch engineCreated;
 
-  private IsAllowedConnectionCallback isAllowedConnectionCallback;
-
   /*
     Simple ARC management for AdblockEngine
     Use `retain` and `release`
@@ -137,7 +135,7 @@ public class AdblockHelper
   {
     ConnectivityManager connectivityManager =
       (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-    this.isAllowedConnectionCallback = new IsAllowedConnectionCallbackImpl(connectivityManager);
+    IsAllowedConnectionCallback isAllowedConnectionCallback = new IsAllowedConnectionCallbackImpl(connectivityManager);

[anton, 2017/09/01 09:56:37]

it would be better to create it right in line #152 and don't use local variable
at all

[sergei, 2017/09/01 10:04:22]

Line 152 is already a part of a long multiline expression, so I think it is
easier to read and maybe even debug the code when it's split into several
expressions. What do you think?

[anton, 2017/09/01 10:05:58]

ok

 
     Log.d(TAG, "Creating adblock engine ...");
 
@@ -225,10 +223,6 @@ public class AdblockHelper
     engine = null;
 
     storage = null;
-
-    // callbacks
-    this.isAllowedConnectionCallback.dispose();
-    this.isAllowedConnectionCallback = null;
   }
 
   /**