From 7c1b83650cc8549077ddf2de22c793d3b01b6fa2 Mon Sep 17 00:00:00 2001 From: Colin Lee Date: Sat, 16 Feb 2019 17:42:01 -0600 Subject: [PATCH] [fenix] Fixes https://github.com/mozilla-mobile/fenix/issues/545: overflow menu for multitasking mixes regular and private --- .../home/sessions/CurrentSessionBottomSheetFragment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessions/CurrentSessionBottomSheetFragment.kt b/app/src/main/java/org/mozilla/fenix/home/sessions/CurrentSessionBottomSheetFragment.kt index 9dc2b44dbc..bae22b97a1 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessions/CurrentSessionBottomSheetFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessions/CurrentSessionBottomSheetFragment.kt @@ -11,6 +11,7 @@ import android.view.ViewGroup import com.google.android.material.bottomsheet.BottomSheetDialogFragment import kotlinx.android.extensions.LayoutContainer import kotlinx.android.synthetic.main.current_session_bottom_sheet.view.* +import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.ext.requireComponents @@ -26,8 +27,11 @@ class CurrentSessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutCon override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { val view = inflater.inflate(R.layout.current_session_bottom_sheet, container, false) + val sessions = requireComponents.core.sessionManager.sessions.filter { + (activity as HomeActivity).browsingModeManager.isPrivate == it.private + } - view.current_session_card_tab_list.text = requireComponents.core.sessionManager.sessions.joinToString(", ") { + view.current_session_card_tab_list.text = sessions.joinToString(", ") { if (it.title.length > maxTitleLength) it.title.substring(0, maxTitleLength) + "..." else it.title }