Issue 6187 - Adjust query string parameters for Yandex

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/AppInfo.java

Index: adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/AppInfo.java
===================================================================
--- a/adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/AppInfo.java
+++ b/adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/AppInfo.java
@@ -15,16 +15,17 @@
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.sbrowser.contentblocker.engine;
 
 import java.util.Locale;
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.Build;
 
 @SuppressLint("DefaultLocale")
 public class AppInfo
 {
   public final String addonName;
   public final String addonVersion;
   public final String application;
@@ -78,20 +79,26 @@ public class AppInfo
   public static AppInfo create(final Context context)
   {
     return new Builder().autoFill(context).build();
   }
 
   public static class Builder
   {
     private static final String SBROWSER_PACKAGE_NAME = "com.sec.android.app.sbrowser";
+    private static final String SBROWSER_BETA_PACKAGE_NAME = "com.sec.android.app.sbrowser.beta";
+    private static final String SBROWSER_APP_NAME = "sbrowser";
+    private static final String YANDEX_PACKAGE_NAME = "com.yandex.browser";
+    private static final String YANDEX_ALPHA_PACKAGE_NAME = "com.yandex.browser.alpha";
+    private static final String YANDEX_BETA_PACKAGE_NAME = "com.yandex.browser.beta";
+    private static final String YANDEX_APP_NAME = "yandex";
 
     private String addonName = "adblockplussbrowser";
     private String addonVersion = "0";
-    private String application = "sbrowser";
+    private String application = "";
     private String applicationVersion = "0";
     private String platform = "android";
     private String platformVersion = Integer.toString(Build.VERSION.SDK_INT);
     private String locale = "en-US";
 
     public Builder autoFill(Context context)
     {
       try
@@ -111,18 +118,53 @@ public class AppInfo
       }
       catch (Throwable t)
       {
         // ignored
       }
 
       this.locale = Locale.getDefault().toString().replace('_', '-');
 
+      this.application = checkForCompatibleInstalledBrowser(context.getPackageManager());
+
       return this;
     }
 
     public AppInfo build()
     {
       return new AppInfo(this.addonName, this.addonVersion, this.application,
           this.applicationVersion, this.platform, this.platformVersion, this.locale);
     }
+
+    private String checkForCompatibleInstalledBrowser(final PackageManager packageManager)
+    {
+      StringBuilder installedCompatibleBrowser = new StringBuilder();
+
+      if (packageIsInstalled(packageManager, SBROWSER_PACKAGE_NAME)
+          || packageIsInstalled(packageManager, SBROWSER_BETA_PACKAGE_NAME))
+      {
+        installedCompatibleBrowser.append(SBROWSER_APP_NAME);
+      }
+
+      if (packageIsInstalled(packageManager, YANDEX_PACKAGE_NAME)
+          || packageIsInstalled(packageManager, YANDEX_ALPHA_PACKAGE_NAME)
+          || packageIsInstalled(packageManager, YANDEX_BETA_PACKAGE_NAME))
+      {
+        installedCompatibleBrowser.append(YANDEX_APP_NAME);
+      }
+
+      return installedCompatibleBrowser.toString();
+    }
+
+    private boolean packageIsInstalled(final PackageManager packageManager, final String packageName)

[diegocarloslima, 2017/12/18 09:15:30]

I would prefer this method to be called isPackageInstalled in order to follow
naming convention for this kind of boolean methods

[jens, 2017/12/18 09:29:48]

Acknowledged.

+    {
+      try
+      {
+        packageManager.getPackageInfo(packageName, 0);
+        return true;
+      }
+      catch (PackageManager.NameNotFoundException e)
+      {
+        return false;
+      }
+    }
   }
 }