Issue 3220 - FAQ and Privacy Policy links redirect to English site only

mobile/android/base/preferences/GeckoPreferences.java

 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.preferences;
 
 import org.mozilla.gecko.AboutPages;
 import org.mozilla.gecko.AdjustConstants;
 import org.mozilla.gecko.AppConstants;
@@ skipping 898 matching lines @@
                 } 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);
+                    // Changed FAQ link format. See https://issues.adblockplus.org/ticket/3220
+                    final String url = getResources().getString(R.string.faq_link, LOCALE);

[Felix Dahlke, 2016/09/15 14:59:22]

How I see it, you're just removing the VERSION and OS parameters. Why not leave
them here? Even though we don't need them (yet), they don't hurt us if we don't
use them, do they?

[diegocarloslima, 2016/10/21 13:37:43]

In order to not break the formatting when keeping VERSION and OS parameters,
we'll need to change the faq_link in strings.xml.in to something like:
<string
name="faq_link">https://adblockplus.org/redirect?link=adblock_browser_android_faq&amp;version=&formatS1;&amp;os=&formatS2;&amp;lang=&formatS3;</string>

Is that ok?

[Felix Dahlke, 2016/10/28 10:14:52]

Hm, well if it's a position based format, that's true... But IMHO I'd prefer
that change (i.e. adding more parameters that we are currently not interested
in) than to change the code here.

[diegocarloslima, 2016/11/02 08:55:48]

Acknowledged.

                     ((LinkPreference) pref).setUrl(url);
                 }
 
                 // 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)) {
@@ skipping 636 matching lines @@
             intent.putExtra("resource", resource);
         } else {
             intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, GeckoPreferenceFragment.class.getName());
 
             Bundle fragmentArgs = new Bundle();
             fragmentArgs.putString("resource", resource);
             intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, fragmentArgs);
         }
     }
 }