Issue 5193 - Apply Samsung Internet UI changes to the frist run slide

adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/engine/Engine.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 62 matching lines @@
   public static final Pattern RE_FILTER_REGEXP = Pattern
       .compile("^(@@)?\\/.*\\/(?:\\$~?[\\w\\-]+(?:=[^,\\s]+)?(?:,~?[\\w\\-]+(?:=[^,\\s]+)?)*)?$");
   public static final Pattern RE_FILTER_OPTIONS = Pattern
       .compile("\\$(~?[\\w\\-]+(?:=[^,\\s]+)?(?:,~?[\\w\\-]+(?:=[^,\\s]+)?)*)$");
   public static final Pattern RE_FILTER_CSSPROPERTY = Pattern
       .compile("\\[\\-abp\\-properties=([\"'])([^\"']+)\\1\\]");
 
   public static final String USER_FILTERS_TITLE = "__filters";
   public static final String USER_EXCEPTIONS_TITLE = "__exceptions";
 
+  public static final String SBROWSER_APP_ID = "com.sec.android.app.sbrowser";
   public static final String ACTION_OPEN_SETTINGS = "com.samsung.android.sbrowser.contentBlocker.ACTION_SETTING";
   public static final String ACTION_UPDATE = "com.samsung.android.sbrowser.contentBlocker.ACTION_UPDATE";
   public static final String EASYLIST_URL = "https://easylist-downloads.adblockplus.org/easylist.txt";
 
   public static final String SUBSCRIPTIONS_EXCEPTIONSURL = "subscriptions_exceptionsurl";
 
   public static final String CHARSET_UTF_8 = "UTF-8";
   private static final String PREFS_KEY_PREVIOUS_VERSION = "key_previous_version";
 
   // The value below specifies an interval of [x, 2*x[, where x =
@@ skipping 76 matching lines @@
    * Starting with Samsung Internet 5.0, the way to enable ad blocking has changed. As a result, we
    * need to check for the version of Samsung Internet and apply text changes to the first run slide.
    *
    * @param activityContext
    * @return a boolean that indicates, if the user has Samsung Internet version 5.x
    */
   public static boolean hasSamsungInternetVersion5OrNewer(final Context activityContext)
   {
     try
     {
-      PackageInfo packageInfo = activityContext.getPackageManager().getPackageInfo(MainPreferences.SBROWSER_APP_ID, NO_FLAG);
+      PackageInfo packageInfo = activityContext.getPackageManager().getPackageInfo(SBROWSER_APP_ID, NO_FLAG);
       return packageInfo.versionCode >= OLDEST_SAMSUNG_INTERNET_5_VERSIONCODE;
     }
     catch (PackageManager.NameNotFoundException e)
     {
       // Should never happen, as checkAAStatusAndProceed() should not be called if the user
       // has no compatible SBrowser installed. Nevertheless we have to handle the Exception.
       Log.d(TAG, "No compatible Samsung Browser found.", e);
       return false;
     }
   }
@@ skipping 609 matching lines @@
       Log.d(TAG, headers.toString());
       this.downloader.enqueueDownload(this.createDownloadURL(sub), sub.getId(), headers);
     }
   }
 
   public void connectivityChanged()
   {
     this.downloader.connectivityChanged();
   }
 }