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 120 matching lines @@
     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))
+      if (isPackageInstalled(packageManager, SBROWSER_PACKAGE_NAME)
+          || isPackageInstalled(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))
+      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 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.

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