Fixes mozilla-mobile#1970 - Guards the close listener

boek · Feb 6, 2019 · f7cd3c0 · f7cd3c0
1 parent 44d0ab1
commit f7cd3c0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/...ustomtabs/src/main/java/mozilla/components/feature/customtabs/CustomTabsToolbarFeature.kt b/...ustomtabs/src/main/java/mozilla/components/feature/customtabs/CustomTabsToolbarFeature.kt
@@ -134,6 +134,10 @@ class CustomTabsToolbarFeature(
      * Should be called when the back button is pressed.
      */
     fun onBackPressed(): Boolean {
+        if (!initialized) {
+            return false
+        }
+
         val result = sessionManager.runWithSession(sessionId) {
             remove(it)
             true

diff --git a/...mtabs/src/test/java/mozilla/components/feature/customtabs/CustomTabsToolbarFeatureTest.kt b/...mtabs/src/test/java/mozilla/components/feature/customtabs/CustomTabsToolbarFeatureTest.kt
@@ -323,4 +323,22 @@ class CustomTabsToolbarFeatureTest {
         assertTrue(result)
         assertTrue(closeExecuted)
     }
+
+    @Test
+    fun `onBackPressed without a session does nothing`() {
+        val sessionId = null
+        val session: Session = mock()
+        val toolbar = BrowserToolbar(RuntimeEnvironment.application)
+        val sessionManager: SessionManager = mock()
+        var closeExecuted = false
+        `when`(session.customTabConfig).thenReturn(mock())
+        `when`(sessionManager.findSessionById(anyString())).thenReturn(session)
+
+        val feature = spy(CustomTabsToolbarFeature(sessionManager, toolbar, sessionId) { closeExecuted = true })
+
+        val result = feature.onBackPressed()
+
+        assertFalse(result)
+        assertFalse(closeExecuted)
+    }
 }
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -16,6 +16,9 @@ permalink: /changelog/
 * **feature-session**
   * Fixed an issue causing `EngineViewPresenter` to render a selected `Session` even though it was configured to show a fixed `Session`. This issue caused a crash (`IllegalStateException: Display already acquired`) in the [Reference Browser](https://github.com/mozilla-mobile/reference-browser) when a "Custom Tab" and the "Browser" tried to render the same `Session`.
 
+* **feature-customtabs**
+  * Fixed an issue causing the `closeListener` to be invoked even when the current session isn't a Custom Tab.
+
 # 0.41.0
 
 * [Commits](https://github.com/mozilla-mobile/android-components/compare/v0.40.0...v0.41.0)