From 27c5570b43a618074f4469247f8d3c9d8964348a Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Fri, 1 Mar 2019 00:06:40 -0800
Subject: [PATCH] For #673 - Dismiss bottom sheet on archive. Remove boolean
 logic

---
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt  | 2 --
 .../fenix/home/sessions/SessionBottomSheetFragment.kt     | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 7f26b6e8b..f30fbb26b 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -339,8 +339,6 @@ class HomeFragment : Fragment() {
                 }
 
                 requireComponents.core.sessionStorage.remove(archivedSession.bundle)
-
-                true
             }
         }.show(requireActivity().supportFragmentManager, SessionBottomSheetFragment.overflowFragmentTag)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessions/SessionBottomSheetFragment.kt b/app/src/main/java/org/mozilla/fenix/home/sessions/SessionBottomSheetFragment.kt
index 57a59a3ba..db43cdfdf 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessions/SessionBottomSheetFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessions/SessionBottomSheetFragment.kt
@@ -19,7 +19,7 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer
     var archivedSession: ArchivedSession? = null
     var isCurrentSession: Boolean = false
     private lateinit var tabTitles: String
-    var onDelete: ((ArchivedSession) -> Boolean)? = null
+    var onDelete: ((ArchivedSession) -> Unit)? = null
     var onArchive: (() -> Unit)? = null
 
     override val containerView: View?
@@ -51,13 +51,13 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer
             visibility = if (isCurrentSession) View.VISIBLE else View.GONE
             setOnClickListener {
                 onArchive?.invoke()
+                dismiss()
             }
         }
 
         view.delete_session_button.setOnClickListener {
-            if (onDelete?.invoke(archivedSession!!) == true) {
-                dismiss()
-            }
+            onDelete?.invoke(archivedSession!!)
+            dismiss()
         }
 
         return view