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

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 21ff3dc51aa0584b9fd46cb0b4ec1cf0c93823a9..88bc6c3dc9d98a200cafc40d79cfc72c9d043f3a 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
@@ -22,12 +22,10 @@ import android.content.SharedPreferences;
 import android.util.Log;
 
 import org.adblockplus.libadblockplus.IsAllowedConnectionCallback;
-import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;

[anton, 2017/03/31 13:34:21]

not related to the task directly

[diegocarloslima, 2017/03/31 14:07:14]

I would prefer this to be in a separate task, but since this is an urgent code
review, I wouldn't insist that much

 import org.adblockplus.libadblockplus.android.AdblockEngine;
 import org.adblockplus.libadblockplus.android.AndroidWebRequestResourceWrapper;
 import org.adblockplus.libadblockplus.android.Utils;
 
-import java.io.File;
 import java.util.Map;

[anton, 2017/03/31 13:34:21]

not related to the task directly - just cleanup

 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -57,6 +55,8 @@ public class AdblockHelper
   private String settingsPreferenceName;
   private String preloadedPreferenceName;
   private Map<String, Integer> urlToResourceIdMap;
+  private String application;
+  private String applicationVersion;
   private AdblockEngine engine;
   private AdblockSettingsStorage storage;
   private CountDownLatch engineCreated;
@@ -126,10 +126,31 @@ public class AdblockHelper
    * @param preferenceName Shared Preferences name to store intercepted requests stats
    * @param urlToResourceIdMap
    */
-  public void preloadSubscriptions(String preferenceName, Map<String, Integer> urlToResourceIdMap)
+  public AdblockHelper preloadSubscriptions(String preferenceName, Map<String, Integer> urlToResourceIdMap)
   {
     this.preloadedPreferenceName = preferenceName;
     this.urlToResourceIdMap = urlToResourceIdMap;
+    return this;
+  }
+
+  /**
+   * Use for requests to identify the client
+   * @param application application
+   */
+  public AdblockHelper setApplication(String application)
+  {
+    this.application = application;
+    return this;
+  }
+
+  /**
+   * Use for requests to identify the client
+   * @param applicationVersion application
+   */
+  public AdblockHelper setApplicationVersion(String applicationVersion)
+  {
+    this.applicationVersion = applicationVersion;
+    return this;

[diegocarloslima, 2017/03/31 14:07:14]

By the ticket description, it seems that application and applicationVersion
should be mandatory instead of optional. If so, this should be included in
init() method

[anton, 2017/03/31 14:16:08]

if they are required then i agree. it's not clear from the task

   }
 
   private void createAdblock()
@@ -146,7 +167,7 @@ public class AdblockHelper
 
     AdblockEngine.Builder builder = AdblockEngine
       .builder(
-        AdblockEngine.generateAppInfo(context, developmentBuild),
+        AdblockEngine.generateAppInfo(context, developmentBuild, application, applicationVersion),
         basePath)
       .setIsAllowedConnectionCallback(isAllowedConnectionCallback)
       .enableElementHiding(true);