Issue 5081 - Make libadblockplus-android users supply the application and applicationVersion parame…

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 93 matching lines @@
    * Init with context
    * @param context application context
    * @param basePath file system root to store files
    *
    *                 Adblock Plus library will download subscription files and store them on
    *                 the path passed. The path should exist and the directory content should not be
    *                 cleared out occasionally. Using `context.getCacheDir().getAbsolutePath()` is not
    *                 recommended because it can be cleared by the system.
    * @param developmentBuild debug or release?
    * @param preferenceName Shared Preferences name to store adblock settings
-   */
-  public AdblockHelper init(Context context, String basePath, boolean developmentBuild, String preferenceName)
+   * @param application Technical name of the platform the app is running on (not user visible).
+   * @param applicationVersion Current version of the platform the app is running on.
+   */
+  public AdblockHelper init(Context context, String basePath,
+                            boolean developmentBuild, String preferenceName,
+                            String application, String applicationVersion)
   {
     this.context = context.getApplicationContext();
     this.basePath = basePath;
     this.developmentBuild = developmentBuild;
     this.settingsPreferenceName = preferenceName;
+    this.application = application;
+    this.applicationVersion = applicationVersion;
     return this;
   }
 
   /**
    * Use preloaded subscriptions
    * @param preferenceName Shared Preferences name to store intercepted requests stats
    * @param urlToResourceIdMap
    */
   public AdblockHelper preloadSubscriptions(String preferenceName, Map<String, Integer> urlToResourceIdMap)
   {
     this.preloadedPreferenceName = preferenceName;
     this.urlToResourceIdMap = urlToResourceIdMap;
-    return this;
-  }
-
-  /**
-   * Used for requests to identify the client

[Felix Dahlke, 2017/03/31 14:06:57]

Nit: We should probably use more concrete descriptions, e.g. those from:
https://github.com/adblockplus/libadblockplus/blob/master/include/AdblockPlus...

-   * @param application application
-   */
-  public AdblockHelper setApplication(String application)
-  {
-    this.application = application;
-    return this;
-  }
-
-  /**
-   * Used for requests to identify the client
-   * @param applicationVersion application version
-   */
-  public AdblockHelper setApplicationVersion(String applicationVersion)
-  {
-    this.applicationVersion = applicationVersion;
     return this;
   }
 
   private void createAdblock()
   {
     this.isAllowedConnectionCallback = new IsAllowedConnectionCallbackImpl(context);
 
     Log.d(TAG, "Creating adblock engine ...");
 
     // read and apply current settings
@@ skipping 146 matching lines @@
         engineCreated.countDown();
         engineCreated = null;
       }
       else
       {
         disposeAdblock();
       }
     }
   }
 }