You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
iceraven-browser/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabSorter.kt

103 lines
3.9 KiB
Kotlin

/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.fenix.tabstray.browser
import androidx.recyclerview.widget.ConcatAdapter
import mozilla.components.browser.state.state.TabSessionState
import mozilla.components.browser.tabstray.TabsTray
import mozilla.components.feature.tabs.tabstray.TabsFeature
[fenix] MR2 Inactive tabs telemetry (https://github.com/mozilla-mobile/fenix/pull/21908) * For https://github.com/mozilla-mobile/fenix/issues/21903 - Added telemetry for interacting with inactive tabs * For https://github.com/mozilla-mobile/fenix/issues/21903 - Added missing inactive tab delete count event to delete all event * For https://github.com/mozilla-mobile/fenix/issues/21903 - Added PR numbers to metrics * For https://github.com/mozilla-mobile/fenix/issues/21903 - Updated broken unit tests. Resolved critical lint warning. * For https://github.com/mozilla-mobile/fenix/issues/21903 - Fixed inactive tabs setting toggle metric * For https://github.com/mozilla-mobile/fenix/issues/21903 - Updated FenixApp unit test * For https://github.com/mozilla-mobile/fenix/issues/21903 - Updated newline character in Metrics. Set inactive tab metrics' lifetime to default. Updated expiration to Nov 2022. Refactored inactive tabs metric to be a single metric. * PR: addendum for last commit that missed a file * For https://github.com/mozilla-mobile/fenix/issues/21903 - Changed logic check for reporting inactive tab count * PR: fixed merge conflict * For https://github.com/mozilla-mobile/fenix/issues/21903 - Removed tab close tracking when the user closes ALL inactive tabs * For https://github.com/mozilla-mobile/fenix/issues/21903 - Removed individual tab close metric verify from CLOSE ALL test * For https://github.com/mozilla-mobile/fenix/issues/21903 - Updated inactive tabs toggle setting expiration to match the expiration of the other events Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
3 years ago
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.toSearchGroup
import org.mozilla.fenix.tabstray.ext.browserAdapter
import org.mozilla.fenix.tabstray.ext.hasSearchTerm
import org.mozilla.fenix.tabstray.ext.inactiveTabsAdapter
import org.mozilla.fenix.tabstray.ext.isActive
import org.mozilla.fenix.tabstray.ext.isNormalTabActiveWithSearchTerm
import org.mozilla.fenix.tabstray.ext.tabGroupAdapter
import org.mozilla.fenix.tabstray.ext.titleHeaderAdapter
import org.mozilla.fenix.utils.Settings
/**
* An intermediary layer to consume tabs from [TabsFeature] for sorting into the various adapters.
*/
class TabSorter(
private val settings: Settings,
[fenix] MR2 Inactive tabs telemetry (https://github.com/mozilla-mobile/fenix/pull/21908) * For https://github.com/mozilla-mobile/fenix/issues/21903 - Added telemetry for interacting with inactive tabs * For https://github.com/mozilla-mobile/fenix/issues/21903 - Added missing inactive tab delete count event to delete all event * For https://github.com/mozilla-mobile/fenix/issues/21903 - Added PR numbers to metrics * For https://github.com/mozilla-mobile/fenix/issues/21903 - Updated broken unit tests. Resolved critical lint warning. * For https://github.com/mozilla-mobile/fenix/issues/21903 - Fixed inactive tabs setting toggle metric * For https://github.com/mozilla-mobile/fenix/issues/21903 - Updated FenixApp unit test * For https://github.com/mozilla-mobile/fenix/issues/21903 - Updated newline character in Metrics. Set inactive tab metrics' lifetime to default. Updated expiration to Nov 2022. Refactored inactive tabs metric to be a single metric. * PR: addendum for last commit that missed a file * For https://github.com/mozilla-mobile/fenix/issues/21903 - Changed logic check for reporting inactive tab count * PR: fixed merge conflict * For https://github.com/mozilla-mobile/fenix/issues/21903 - Removed tab close tracking when the user closes ALL inactive tabs * For https://github.com/mozilla-mobile/fenix/issues/21903 - Removed individual tab close metric verify from CLOSE ALL test * For https://github.com/mozilla-mobile/fenix/issues/21903 - Updated inactive tabs toggle setting expiration to match the expiration of the other events Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
3 years ago
private val metrics: MetricController,
private val concatAdapter: ConcatAdapter
) : TabsTray {
private var shouldReportMetrics: Boolean = true
private val groupsSet = mutableSetOf<String>()
override fun updateTabs(tabs: List<TabSessionState>, selectedTabId: String?) {
val inactiveTabs = tabs.getInactiveTabs(settings)
val searchTermTabs = tabs.getSearchGroupTabs(settings)
val normalTabs = tabs - inactiveTabs - searchTermTabs
// Inactive tabs
concatAdapter.inactiveTabsAdapter.updateTabs(inactiveTabs, selectedTabId)
// Tab groups
// We don't need to provide a selectedId, because the [TabGroupAdapter] has that built-in with support from
// NormalBrowserPageViewHolder.scrollToTab.
val (groups, remainderTabs) = searchTermTabs.toSearchGroup(groupsSet)
groupsSet.clear()
groupsSet.addAll(groups.map { it.searchTerm })
concatAdapter.tabGroupAdapter.submitList(groups)
// Normal tabs.
val totalNormalTabs = (normalTabs + remainderTabs)
concatAdapter.browserAdapter.updateTabs(totalNormalTabs, selectedTabId)
// Normal tab title header.
concatAdapter.titleHeaderAdapter
.handleListChanges(totalNormalTabs.isNotEmpty() && groups.isNotEmpty())
if (shouldReportMetrics) {
shouldReportMetrics = false
if (settings.inactiveTabsAreEnabled) {
metrics.track(Event.TabsTrayHasInactiveTabs(inactiveTabs.size))
}
if (groups.isNotEmpty()) {
val averageTabsPerGroup = groups.map { it.tabs.size }.average()
metrics.track(Event.AverageTabsPerSearchTermGroup(averageTabsPerGroup))
}
metrics.track(Event.SearchTermGroupCount(groups.size))
}
}
}
/**
* Returns a list of inactive tabs based on our preferences.
*/
private fun List<TabSessionState>.getInactiveTabs(settings: Settings): List<TabSessionState> {
val inactiveTabsEnabled = settings.inactiveTabsAreEnabled
return if (inactiveTabsEnabled) {
filter { !it.isActive(maxActiveTime) }
} else {
emptyList()
}
}
/**
* Returns a list of search term tabs based on our preferences.
*/
private fun List<TabSessionState>.getSearchGroupTabs(settings: Settings): List<TabSessionState> {
val inactiveTabsEnabled = settings.inactiveTabsAreEnabled
val tabGroupsEnabled = settings.searchTermTabGroupsAreEnabled
return when {
tabGroupsEnabled && inactiveTabsEnabled ->
filter { it.isNormalTabActiveWithSearchTerm(maxActiveTime) }
tabGroupsEnabled ->
filter { it.hasSearchTerm() }
else -> emptyList()
}
}