Bug 1613416 - Hide "Report site issue" button in Fenix Production.

fennec/beta
Dennis Schubert 4 years ago committed by Jeff Boek
parent b030d3ac9f
commit be06450dd9

@ -22,7 +22,9 @@ import mozilla.components.browser.menu.item.BrowserMenuItemToolbar
import mozilla.components.browser.session.Session import mozilla.components.browser.session.Session
import mozilla.components.browser.session.SessionManager import mozilla.components.browser.session.SessionManager
import mozilla.components.concept.storage.BookmarksStorage import mozilla.components.concept.storage.BookmarksStorage
import org.mozilla.fenix.Config
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.ReleaseChannel
import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.browser.browsingmode.BrowsingMode
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.theme.ThemeManager import org.mozilla.fenix.theme.ThemeManager
@ -132,6 +134,10 @@ class DefaultToolbarMenu(
context.components.browsingModeManager.mode == BrowsingMode.Normal context.components.browsingModeManager.mode == BrowsingMode.Normal
val shouldDeleteDataOnQuit = Settings.getInstance(context) val shouldDeleteDataOnQuit = Settings.getInstance(context)
.shouldDeleteBrowsingDataOnQuit .shouldDeleteBrowsingDataOnQuit
val shouldShowWebcompatReporter = Config.channel !in setOf(
ReleaseChannel.FenixProduction,
ReleaseChannel.FennecProduction
)
// Predicates that need to be repeatedly called as the session changes // Predicates that need to be repeatedly called as the session changes
fun shouldShowAddToHomescreen(): Boolean = fun shouldShowAddToHomescreen(): Boolean =
@ -154,7 +160,7 @@ class DefaultToolbarMenu(
findInPage, findInPage,
privateTab, privateTab,
newTab, newTab,
reportIssue, if (shouldShowWebcompatReporter) reportIssue else null,
if (shouldShowSaveToCollection) saveToCollection else null, if (shouldShowSaveToCollection) saveToCollection else null,
if (shouldDeleteDataOnQuit) deleteDataOnQuit else null, if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
readerMode.apply { visible = ::shouldShowReaderMode }, readerMode.apply { visible = ::shouldShowReaderMode },

Loading…
Cancel
Save