Bug 1239513 - Replace about:feedback with page hosted on input.mozilla.org. r=sebastian

MozReview-Commit-ID: K4AmE1zNtBI

--HG--
extra : rebase_source : fbabfd6e9aea578050ebb41835e3fbc92c189ec6

mobile/android/app/mobile.js

@@ -485,7 +485,8 @@ pref("app.support.baseURL", "http://support.mozilla.org/1/mobile/%VERSION%/%OS%/
 pref("app.feedback.postURL", "https://input.mozilla.org/api/v1/feedback/");
 
 // URL for feedback page
-pref("app.feedbackURL", "about:feedback");
+// This should be kept in sync with the "feedback_link" string defined in strings.xml.in
+pref("app.feedbackURL", "https://input.mozilla.org/feedback/android/%VERSION%/%CHANNEL%/?utm_source=feedback-prompt");
 
 pref("app.privacyURL", "https://www.mozilla.org/privacy/firefox/");
 pref("app.creditsURL", "http://www.mozilla.org/credits/");

mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java

@@ -895,17 +895,10 @@ OnSharedPreferenceChangeListener
                     final String url = getResources().getString(R.string.faq_link, VERSION, OS, LOCALE);
                     ((LinkPreference) pref).setUrl(url);
                 } else if (PREFS_FEEDBACK_LINK.equals(key)) {
-                    PrefsHelper.getPref("app.feedbackURL", new PrefsHelper.PrefHandlerBase() {
-                        @Override
-                        public void prefValue(String prefName, final String value) {
-                            ThreadUtils.postToUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    ((LinkPreference) pref).setUrl(value);
-                                }
-                            });
-                        }
-                    });
+                    // 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()) {
                         preferences.removePreference(pref);

mobile/android/base/strings.xml.in

@@ -87,6 +87,10 @@
 
   <string name="url_bar_default_text">&url_bar_default_text2;</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>
+
   <!-- 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>
 

mobile/android/chrome/content/Feedback.js

@@ -7,7 +7,7 @@ var Feedback = {
 
   get _feedbackURL() {
     delete this._feedbackURL;
-    return this._feedbackURL = Services.prefs.getCharPref("app.feedbackURL");
+    return this._feedbackURL = Services.urlFormatter.formatURLPref("app.feedbackURL");
   },
 
   observe: function(aMessage, aTopic, aData) {
@@ -21,7 +21,7 @@ var Feedback = {
       return;
     } catch (e) {}
 
-    let url = this._feedbackURL + "?source=feedback-prompt";
+    let url = this._feedbackURL;
     let browser = BrowserApp.selectOrAddTab(url, { parentId: BrowserApp.selectedTab.id }).browser;
     browser.addEventListener("FeedbackClose", this, false, true);
     browser.addEventListener("FeedbackMaybeLater", this, false, true);