Issue 6187 - Adjust query string parameters for Yandex

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/AppInfo.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 66 matching lines @@
   }
 
   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 = "";
     private String applicationVersion = "0";
     private String platform = "android";
     private String platformVersion = Integer.toString(Build.VERSION.SDK_INT);
     private String locale = "en-US";
 
@@ skipping 25 matching lines @@
 
       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)

[diegocarloslima, 2017/12/15 16:13:43]

I think that we should also consider all the alpha/beta variants packages:
com.sec.android.app.sbrowser.beta
com.yandex.browser.alpha
com.yandex.browser.beta

[jens, 2017/12/18 08:41:34]

Thats actually a good idea :)

     {
       StringBuilder installedCompatibleBrowser = new StringBuilder();
+
+      if (isPackageInstalled(packageManager, SBROWSER_PACKAGE_NAME)
+          || isPackageInstalled(packageManager, SBROWSER_BETA_PACKAGE_NAME))
+      {
+        installedCompatibleBrowser.append(SBROWSER_APP_NAME);
+      }
+
+      if (isPackageInstalled(packageManager, YANDEX_PACKAGE_NAME)
+          || isPackageInstalled(packageManager, YANDEX_ALPHA_PACKAGE_NAME)
+          || isPackageInstalled(packageManager, YANDEX_BETA_PACKAGE_NAME))
+      {
+        installedCompatibleBrowser.append(YANDEX_APP_NAME);
+      }
+
+      return installedCompatibleBrowser.toString();
+    }
+
+    private boolean isPackageInstalled(final PackageManager packageManager, final String packageName)
+    {
       try
       {
-        packageManager.getPackageInfo(SBROWSER_PACKAGE_NAME, 0);
-        installedCompatibleBrowser.append(SBROWSER_APP_NAME);
+        packageManager.getPackageInfo(packageName, 0);
+        return true;
       }
       catch (PackageManager.NameNotFoundException e)
       {
-        // nothing
+        return false;
       }
-      try
-      {
-        packageManager.getPackageInfo(YANDEX_PACKAGE_NAME, 0);
-        installedCompatibleBrowser.append(YANDEX_APP_NAME);
-      }
-      catch (PackageManager.NameNotFoundException e)
-      {
-        // nothing
-      }
-      return installedCompatibleBrowser.toString();
     }
   }
 }