Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android ANR: com.duckduckgo.app.tabs.ui.TabSwitcherAdapter.loadTabPreviewImage #5432

Merged
merged 1 commit into from
Jan 6, 2025
Merged

Android ANR: com.duckduckgo.app.tabs.ui.TabSwitcherAdapter.loadTabPreviewImage #5432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine

private val viewModel: TabSwitcherViewModel by bindViewModel()

private val tabsAdapter: TabSwitcherAdapter by lazy { TabSwitcherAdapter(this, webViewPreviewPersister, this, faviconManager) }
private val tabsAdapter: TabSwitcherAdapter by lazy { TabSwitcherAdapter(this, webViewPreviewPersister, this, faviconManager, dispatchers) }

// we need to scroll to show selected tab, but only if it is the first time loading the tabs.
private var firstTimeLoadingTabsList = true
Expand Down
25 changes: 18 additions & 7 deletions app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,19 @@ import com.duckduckgo.app.tabs.ui.TabSwitcherAdapter.TabViewHolder
import com.duckduckgo.app.tabs.ui.TabSwitcherAdapter.TabViewHolder.GridTabViewHolder
import com.duckduckgo.app.tabs.ui.TabSwitcherAdapter.TabViewHolder.ListTabViewHolder
import com.duckduckgo.common.ui.view.show
import com.duckduckgo.common.utils.DispatcherProvider
import com.duckduckgo.common.utils.swap
import java.io.File
import java.util.Collections.swap
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import timber.log.Timber

class TabSwitcherAdapter(
private val itemClickListener: TabSwitcherListener,
private val webViewPreviewPersister: WebViewPreviewPersister,
private val lifecycleOwner: LifecycleOwner,
private val faviconManager: FaviconManager,
private val dispatchers: DispatcherProvider,
) : Adapter<TabViewHolder>() {

private val list = mutableListOf<TabEntity>()
Expand Down Expand Up @@ -174,14 +176,23 @@ class TabSwitcherAdapter(

private fun loadTabPreviewImage(tab: TabEntity, glide: RequestManager, holder: GridTabViewHolder) {
val previewFile = tab.tabPreviewFile ?: return glide.clear(holder.tabPreview)
val cachedWebViewPreview = File(webViewPreviewPersister.fullPathForFile(tab.tabId, previewFile))
if (!cachedWebViewPreview.exists()) return glide.clear(holder.tabPreview)

glide.load(cachedWebViewPreview)
.transition(DrawableTransitionOptions.withCrossFade())
.into(holder.tabPreview)
lifecycleOwner.lifecycleScope.launch {
val cachedWebViewPreview = withContext(dispatchers.io()) {
File(webViewPreviewPersister.fullPathForFile(tab.tabId, previewFile)).takeIf { it.exists() }
}

if (cachedWebViewPreview == null) {
glide.clear(holder.tabPreview)
return@launch
}

glide.load(cachedWebViewPreview)
.transition(DrawableTransitionOptions.withCrossFade())
.into(holder.tabPreview)

holder.tabPreview.show()
holder.tabPreview.show()
}
}

private fun attachClickListeners(holder: TabViewHolder, tab: TabEntity) {
Expand Down
Loading