From 77189a00a0c77ade78607aaa2a668f02a3b0a32a Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Thu, 28 Feb 2019 12:39:18 -0800 Subject: [PATCH] Fixes #741 - Dont show the current session in the previous session list --- .../main/java/org/mozilla/fenix/home/HomeFragment.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 de975feca..4a3e58c39 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -95,11 +95,13 @@ class HomeFragment : Fragment() { val bundles = requireComponents.core.sessionStorage.bundles(temporaryNumberOfSessions) bundles.observe(this, Observer { sessionBundles -> - val archivedSessions = sessionBundles.mapNotNull { sessionBundle -> - sessionBundle.id?.let { - ArchivedSession(it, sessionBundle, sessionBundle.lastSavedAt, sessionBundle.urls) + val archivedSessions = sessionBundles + .filter { it.id != requireComponents.core.sessionStorage.current()?.id } + .mapNotNull { sessionBundle -> + sessionBundle.id?.let { + ArchivedSession(it, sessionBundle, sessionBundle.lastSavedAt, sessionBundle.urls) + } } - } getManagedEmitter().onNext(SessionsChange.Changed(archivedSessions)) })