Issue mozilla-mobile#35: Handle device back button

csadilek · May 4, 2018 · 793bbad · 793bbad
1 parent 6ec93d2
commit 793bbad
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/app/src/main/java/mozilla/fenix/MainActivity.kt b/app/src/main/java/mozilla/fenix/MainActivity.kt
@@ -17,26 +17,38 @@ import mozilla.fenix.components.FeatureLifecycleObserver
 import mozilla.fenix.ext.components
 
 class MainActivity : AppCompatActivity() {
+    private var toolbarFeature: ToolbarFeature? = null
+    private var sessionFeature: SessionFeature? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val toolbarFeature = ToolbarFeature(
-                components.sessionManager,
-                components.sessionUseCases.loadUrl,
-                toolbar)
+        toolbarFeature = ToolbarFeature(
+            components.sessionManager,
+            components.sessionUseCases.loadUrl,
+            toolbar)
 
-        val sessionFeature = SessionFeature(
-                components.sessionManager,
-                components.sessionUseCases,
-                components.engine,
-                engineView,
-                components.sessionMapping)
+        sessionFeature = SessionFeature(
+            components.sessionManager,
+            components.sessionUseCases,
+            components.engine,
+            engineView,
+            components.sessionMapping)
 
         lifecycle.addObserver(FeatureLifecycleObserver(sessionFeature, toolbarFeature))
     }
 
+    override fun onBackPressed() {
+        if (toolbarFeature?.handleBackPressed() == true)
+            return
+
+        if (sessionFeature?.handleBackPressed() == true)
+            return
+
+        super.onBackPressed()
+    }
+
     override fun onCreateView(parent: View?, name: String?, context: Context?, attrs: AttributeSet?): View? {
         if (name == EngineView::class.java.name) {
             return components.engine.createView(context!!, attrs).asView()

diff --git a/app/src/main/java/mozilla/fenix/components/FeatureLifecycleObserver.kt b/app/src/main/java/mozilla/fenix/components/FeatureLifecycleObserver.kt
@@ -14,18 +14,18 @@ import mozilla.components.feature.toolbar.ToolbarFeature
  * LifecycleObserver implementation that will forward lifecycle callbacks to "feature" components.
  */
 class FeatureLifecycleObserver(
-    private val sessionFeature: SessionFeature,
-    private val toolbarFeature: ToolbarFeature
+    private val sessionFeature: SessionFeature?,
+    private val toolbarFeature: ToolbarFeature?
 ): LifecycleObserver {
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     fun startFeatures() {
-        sessionFeature.start()
-        toolbarFeature.start()
+        sessionFeature?.start()
+        toolbarFeature?.start()
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
     fun stopFeatures() {
-        sessionFeature.stop()
-        toolbarFeature.stop()
+        sessionFeature?.stop()
+        toolbarFeature?.stop()
     }
 }