Issue 6364 - Exclude double initialization of AdblockHelper

libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/Application.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 36 matching lines @@
     {
       // put your Adblock FilterEngine deinit here
     }
   };
 
   @Override
   public void onCreate()
   {
     super.onCreate();
 
-    // init Adblock
-    String basePath = getDir(AdblockEngine.BASE_PATH_DIRECTORY, Context.MODE_PRIVATE).getAbsolutePath();
+    // it's not initialized here but we check it just to show API usage
+    if (!AdblockHelper.get().isInit())
+    {
+      // init Adblock
+      String basePath = getDir(AdblockEngine.BASE_PATH_DIRECTORY, Context.MODE_PRIVATE).getAbsolutePath();

[jens, 2018/02/07 09:36:25]

basePath can be final

[anton, 2018/02/07 09:52:55]

agree, but it's unrelated to the task.

[jens, 2018/02/07 10:03:23]

Acknowledged.

 
-    // provide preloaded subscriptions
-    Map<String, Integer> map = new HashMap<String, Integer>();
-    map.put(AndroidWebRequestResourceWrapper.EASYLIST, R.raw.easylist);
-    map.put(AndroidWebRequestResourceWrapper.EASYLIST_CHINESE, R.raw.easylist);
-    map.put(AndroidWebRequestResourceWrapper.ACCEPTABLE_ADS, R.raw.exceptionrules);
+      // provide preloaded subscriptions
+      Map<String, Integer> map = new HashMap<String, Integer>();

[jens, 2018/02/07 09:36:25]

I would use a more descriptive name like 'subscriptions' for the map an also
make it final

[anton, 2018/02/07 09:52:55]

agree too, but it's unrelated to the task too.

[jens, 2018/02/07 10:03:23]

Acknowledged.

+      map.put(AndroidWebRequestResourceWrapper.EASYLIST, R.raw.easylist);
+      map.put(AndroidWebRequestResourceWrapper.EASYLIST_CHINESE, R.raw.easylist);
+      map.put(AndroidWebRequestResourceWrapper.ACCEPTABLE_ADS, R.raw.exceptionrules);
 
-    AdblockHelper
-      .get()
-      .init(this, basePath, true, AdblockHelper.PREFERENCE_NAME)
-      .preloadSubscriptions(AdblockHelper.PRELOAD_PREFERENCE_NAME, map)
-      .addEngineCreatedListener(engineCreatedListener)
-      .addEngineDisposedListener(engineDisposedListener);
+      AdblockHelper
+        .get()
+        .init(this, basePath, true, AdblockHelper.PREFERENCE_NAME)
+        .preloadSubscriptions(AdblockHelper.PRELOAD_PREFERENCE_NAME, map)
+        .addEngineCreatedListener(engineCreatedListener)
+        .addEngineDisposedListener(engineDisposedListener);
+    }
   }
 }