Issue 5288 - Pass android app name and version

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

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 38 matching lines @@
    */
   public static final String PRELOAD_PREFERENCE_NAME = "ADBLOCK_PRELOAD";
   private static AdblockHelper _instance;
 
   private Context context;
   private String basePath;
   private boolean developmentBuild;
   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;
 
   private IsAllowedConnectionCallback isAllowedConnectionCallback;
 
   /*
     Simple ARC management for AdblockEngine
     Use `retain` and `release`
    */
@@ skipping 34 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
-   * @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)
+                            boolean developmentBuild, String preferenceName)
   {
     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)
   {
@@ skipping 11 matching lines @@
     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
       .builder(
-        AdblockEngine.generateAppInfo(context, developmentBuild, application, applicationVersion),
+        AdblockEngine.generateAppInfo(context, developmentBuild),
         basePath)
       .setIsAllowedConnectionCallback(isAllowedConnectionCallback)
       .enableElementHiding(true);
 
     // if preloaded subscriptions provided
     if (preloadedPreferenceName != null)
     {
       SharedPreferences preloadedSubscriptionsPrefs = context.getSharedPreferences(
         preloadedPreferenceName,
         Context.MODE_PRIVATE);
@@ skipping 128 matching lines @@
         engineCreated.countDown();
         engineCreated = null;
       }
       else
       {
         disposeAdblock();
       }
     }
   }
 }