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

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

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 42 matching lines @@
   private Context context;
   private String basePath;
   private boolean developmentBuild;
   private String settingsPreferenceName;
   private String preloadedPreferenceName;
   private Map<String, Integer> urlToResourceIdMap;
   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 55 matching lines @@
   {
     this.preloadedPreferenceName = preferenceName;
     this.urlToResourceIdMap = urlToResourceIdMap;
     return this;
   }
 
   private void createAdblock()
   {
     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 ...");
 
     // read and apply current settings
     SharedPreferences settingsPrefs = context.getSharedPreferences(
       settingsPreferenceName,
       Context.MODE_PRIVATE);
     storage = new SharedPrefsStorage(settingsPrefs);
 
     AdblockEngine.Builder builder = AdblockEngine
@@ skipping 67 matching lines @@
   }
 
   private void disposeAdblock()
   {
     Log.w(TAG, "Disposing adblock engine");
 
     engine.dispose();
     engine = 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 49 matching lines @@
         engineCreated.countDown();
         engineCreated = null;
       }
       else
       {
         disposeAdblock();
       }
     }
   }
 }