Issue 3001 - FAQ settings item should lead to the Adblock Browser FAQ

mobile/android/base/preferences/GeckoPreferences.java

Index: mobile/android/base/preferences/GeckoPreferences.java
===================================================================
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -905,25 +905,19 @@ OnSharedPreferenceChangeListener
                         preferences.removePreference(pref);
                         i--;
                         continue;
                     }
                 } else if (PREFS_HOMEPAGE.equals(key)) {
                     String setUrl = GeckoSharedPrefs.forProfile(getBaseContext()).getString(PREFS_HOMEPAGE, AboutPages.HOME);
                     setHomePageSummary(pref, setUrl);
                     pref.setOnPreferenceChangeListener(this);
-                } else if (PREFS_FAQ_LINK.equals(key)) {
-                    // Format the FAQ link
-                    final String VERSION = AppConstants.MOZ_APP_VERSION;
-                    final String OS = AppConstants.OS_TARGET;
-                    final String LOCALE = Locales.getLanguageTag(Locale.getDefault());
-
-                    final String url = getResources().getString(R.string.faq_link, VERSION, OS, LOCALE);
-                    ((LinkPreference) pref).setUrl(url);
                 }
+                // Removed PREFS_FAQ_LINK condition so it won't override the FAQ url programatically
+                // See https://issues.adblockplus.org/ticket/3001

[Felix Dahlke, 2016/06/16 13:33:34]

Do we actually have to remove this code? How I see it, this'll just attempt
substitution, but if we don't add any substitution tags to the source string, we
should be able to leave this code alone. Or am I missing something?

 
                 // Some Preference UI elements are not actually preferences,
                 // but they require a key to work correctly. For example,
                 // "Clear private data" requires a key for its state to be
                 // saved when the orientation changes. It uses the
                 // "android.not_a_preference.privacy.clear" key - which doesn't
                 // exist in Gecko - to satisfy this requirement.
                 if (isGeckoPref(key)) {