From 951a5dfbad99d3d2e617ffd1bb24d7a5384087ba Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Fri, 8 Feb 2019 11:43:32 +0100 Subject: [PATCH] Fix breaking API changes of latest AC snapshot. --- app/src/main/java/org/mozilla/fenix/FenixApplication.kt | 2 +- app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt index 5098c3caf..d3908dafd 100644 --- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt +++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt @@ -35,7 +35,7 @@ class FenixApplication : Application() { private fun setupGlean(context: Context) { Glean.initialize(context) - Glean.setMetricsEnabled(BuildConfig.TELEMETRY) + Glean.setUploadEnabled(BuildConfig.TELEMETRY) } private fun loadExperiments() { diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index 986ab762f..59d36bf78 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -166,7 +166,7 @@ class BrowserFragment : Fragment(), BackHandler { @SuppressWarnings("ReturnCount") override fun onBackPressed(): Boolean { if (findInPageIntegration.onBackPressed()) return true - if (sessionFeature.handleBackPressed()) return true + if (sessionFeature.onBackPressed()) return true if (customTabsToolbarFeature.onBackPressed()) return true // We'll want to improve this when we add multitasking