|
|
|
@ -283,7 +283,6 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
launch(Dispatchers.Main) {
|
|
|
|
|
getManagedEmitter<SessionControlChange>().onNext(
|
|
|
|
|
SessionControlChange.Change(
|
|
|
|
|
tabs = getListOfTabs(sessionManager = requireComponents.core.sessionManager),
|
|
|
|
@ -291,7 +290,6 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
|
|
|
|
|
collections = requireComponents.core.tabCollectionStorage.cachedTabCollections
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
requireComponents.core.tabCollectionStorage.register(collectionStorageObserver, this)
|
|
|
|
|
sessionObserver.onStart()
|
|
|
|
@ -566,7 +564,6 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun removeTabWithUndo(sessionId: String) {
|
|
|
|
|
launch(Dispatchers.Main) {
|
|
|
|
|
val sessionManager = requireComponents.core.sessionManager
|
|
|
|
|
|
|
|
|
|
// Update the UI with the tab removed, but don't remove it from storage yet
|
|
|
|
@ -608,21 +605,18 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
|
|
|
|
|
operation = deleteOperation
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun emitSessionChanges() {
|
|
|
|
|
val sessionManager = context?.components?.core?.sessionManager ?: return
|
|
|
|
|
|
|
|
|
|
launch(Dispatchers.Main) {
|
|
|
|
|
getManagedEmitter<SessionControlChange>().onNext(
|
|
|
|
|
SessionControlChange.TabsChange(
|
|
|
|
|
getListOfTabs(sessionManager)
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private suspend fun getListOfTabs(sessionManager: SessionManager): List<Tab> {
|
|
|
|
|
private fun getListOfTabs(sessionManager: SessionManager): List<Tab> {
|
|
|
|
|
val context = context ?: return listOf()
|
|
|
|
|
return sessionManager.sessions
|
|
|
|
|
.filter { (activity as HomeActivity).browsingModeManager.isPrivate == it.private }
|
|
|
|
@ -653,7 +647,6 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
|
|
|
|
|
|
|
|
|
|
val context = context?.let { it } ?: return
|
|
|
|
|
|
|
|
|
|
launch(Dispatchers.Main) {
|
|
|
|
|
val tabs = requireComponents.core.sessionManager.sessions.filter { !it.private }
|
|
|
|
|
.map { Tab(it.id, it.url, it.url.urlToTrimmedHost(context), it.title) }
|
|
|
|
|
|
|
|
|
@ -675,7 +668,6 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
|
|
|
|
|
nav(R.id.homeFragment, directions)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun share(url: String? = null, tabs: List<ShareTab>? = null) {
|
|
|
|
|
val directions =
|
|
|
|
|