Bug 1356053 - Update Fennec in-product sumo links. r?sebastian
MozReview-Commit-ID: JhaAt0oIA8G
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -3687,17 +3687,17 @@ public class BrowserApp extends GeckoApp
return true;
}
if (itemId == R.id.help) {
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.help_link, VERSION, OS, LOCALE);
+ final String URL = getResources().getString(R.string.help_link, LOCALE);
Tabs.getInstance().loadUrlInTab(URL);
return true;
}
if (itemId == R.id.addons) {
Tabs.getInstance().loadUrlInTab(AboutPages.ADDONS);
return true;
}
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/WhatsNewReceiver.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/WhatsNewReceiver.java
@@ -73,18 +73,16 @@ public class WhatsNewReceiver extends Br
final int notificationID = EXTRA_WHATSNEW_NOTIFICATION.hashCode();
notificationManager.notify(notificationID, notification);
Telemetry.sendUIEvent(TelemetryContract.Event.SHOW, TelemetryContract.Method.NOTIFICATION, EXTRA_WHATSNEW_NOTIFICATION);
}
private PendingIntent getContentIntent(Context context) {
final String link = context.getString(R.string.whatsnew_notification_url,
- AppConstants.MOZ_APP_VERSION,
- AppConstants.OS_TARGET,
Locales.getLanguageTag(Locale.getDefault()));
final Intent i = new Intent(Intent.ACTION_VIEW);
i.setClassName(AppConstants.ANDROID_PACKAGE_NAME, AppConstants.MOZ_ANDROID_BROWSER_INTENT_CLASS);
i.setData(Uri.parse(link));
i.putExtra(EXTRA_WHATSNEW_NOTIFICATION, true);
return PendingIntent.getActivity(context, 0, i, PendingIntent.FLAG_UPDATE_CURRENT);
--- a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
+++ b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
@@ -885,21 +885,18 @@ public class GeckoPreferences
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);
+ final String url = getResources().getString(R.string.faq_link, LOCALE);
((LinkPreference) pref).setUrl(url);
} else if (PREFS_FEEDBACK_LINK.equals(key)) {
// Format the feedback link. We can't easily use this "app.feedbackURL"
// Gecko preference because the URL must be formatted.
final String url = getResources().getString(R.string.feedback_link, AppConstants.MOZ_APP_VERSION, AppConstants.MOZ_UPDATE_CHANNEL);
((LinkPreference) pref).setUrl(url);
} else if (PREFS_DYNAMIC_TOOLBAR.equals(key)) {
if (DynamicToolbar.isForceDisabled()) {
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -80,18 +80,18 @@
<string name="crash_email">&crash_email;</string>
<string name="crash_closing_alert">&crash_closing_alert;</string>
<string name="sending_crash_report">&sending_crash_report;</string>
<string name="crash_close_label">&crash_close_label;</string>
<string name="crash_restart_label">&crash_restart_label;</string>
<string name="url_bar_default_text">&url_bar_default_text2;</string>
- <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/mobile-help -->
- <string name="help_link">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/mobile-help</string>
+ <!-- https://support.mozilla.org/kb/mobile-help-%LOCALE% -->
+ <string name="help_link">https://support.mozilla.org/kb/mobile-help-&formatS1;</string>
<string name="help_menu">&help_menu;</string>
<string name="quit">&quit;</string>
<string name="bookmark">&bookmark;</string>
<string name="bookmark_remove">&bookmark_remove;</string>
<string name="bookmark_added">&bookmark_added;</string>
<string name="bookmark_already_added">&bookmark_already_added;</string>
<string name="bookmark_removed">&bookmark_removed;</string>
@@ -322,18 +322,17 @@
<string name="content_notification_updated_on">&content_notification_updated_on;</string>
<string name="pref_default_browser">&pref_default_browser;</string>
<string name="pref_default_browser_mozilla_support_tablet">&pref_default_browser_mozilla_support_tablet;</string>
<string name="pref_about_firefox">&pref_about_firefox;</string>
<string name="pref_vendor_faqs">&pref_vendor_faqs;</string>
- <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/faq -->
- <string name="faq_link">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/faq</string>
+ <string name="faq_link">https://support.mozilla.org/kb/faq-&formatS1;</string>
<string name="pref_vendor_feedback">&pref_vendor_feedback;</string>
<!-- https://input.mozilla.org/feedback/android/%VERSION%/%CHANNEL%/?utm_source=feedback-settings
This should be kept in sync with the "app.feedbackURL" pref defined in mobile.js -->
<string name="feedback_link">https://input.mozilla.org/feedback/android/&formatS1;/&formatS2;/?utm_source=feedback-settings</string>
<string name="pref_dialog_set_default">&pref_dialog_set_default;</string>
<string name="pref_default">&pref_dialog_default;</string>
@@ -608,23 +607,23 @@
<string name="intent_uri_private_browsing_prompt">&intent_uri_private_browsing_prompt;</string>
<string name="intent_uri_private_browsing_multiple_match_title">&intent_uri_private_browsing_multiple_match_title;</string>
<string name="devtools_auth_scan_header">&devtools_auth_scan_header;</string>
<string name="unsupported_sdk_version">&unsupported_sdk_version;</string>
<string name="eol_notification_title">&eol_notification_title2;</string>
<string name="eol_notification_summary">&eol_notification_summary;</string>
- <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/honeycomb -->
+
+ <!-- TODO: remove not used: https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/honeycomb -->
<string name="eol_notification_url">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/unsupported-version</string>
<string name="whatsnew_notification_title">&whatsnew_notification_title;</string>
<string name="whatsnew_notification_summary">&whatsnew_notification_summary;</string>
- <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/new-android -->
- <string name="whatsnew_notification_url">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/new-android</string>
+ <string name="whatsnew_notification_url">https://support.mozilla.org/kb/new-android-&formatS1;</string>
<string name="promotion_add_to_homescreen">&promotion_add_to_homescreen;</string>
<string name="helper_first_offline_bookmark_title">&helper_first_offline_bookmark_title;</string>
<string name="helper_first_offline_bookmark_message">&helper_first_offline_bookmark_message;</string>
<string name="helper_first_offline_bookmark_button">&helper_first_offline_bookmark_button;</string>
<string name="helper_triple_readerview_open_title">&helper_triple_readerview_open_title;</string>