Fixes #741 - Dont show the current session in the previous session list

5 years ago · 77189a00a0
parent abd225463a
commit 77189a00a0
1 changed files with 6 additions and 4 deletions
--- 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<SessionsChange>().onNext(SessionsChange.Changed(archivedSessions))
        })