Skip to content

[stable-3.35] fix: calculate scan interval network on main thread exception #16124

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

Merged
alperozturk96 merged 1 commit into from
Dec 12, 2025
Merged

[stable-3.35] fix: calculate scan interval network on main thread exception #16124

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
1 change: 1 addition & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ class SyncedFoldersActivity :
val gridWidth = resources.getInteger(R.integer.media_grid_width)
val lightVersion = resources.getBoolean(R.bool.syncedFolder_light)
adapter = SyncedFolderAdapter(
lifecycleScope,
this,
clock,
gridWidth,
Expand Down
23 changes: 16 additions & 7 deletions app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import android.widget.PopupMenu
import androidx.annotation.VisibleForTesting
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
import androidx.lifecycle.LifecycleCoroutineScope
import com.afollestad.sectionedrecyclerview.SectionedRecyclerViewAdapter
import com.afollestad.sectionedrecyclerview.SectionedViewHolder
import com.google.android.material.button.MaterialButton
Expand All @@ -40,6 +41,9 @@ import com.owncloud.android.datamodel.ThumbnailsCacheManager
import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncMediaThumbnailDrawable
import com.owncloud.android.datamodel.ThumbnailsCacheManager.MediaThumbnailGenerationTask
import com.owncloud.android.utils.theme.ViewThemeUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.io.File
import java.util.Locale
import java.util.concurrent.Executor
Expand All @@ -51,6 +55,7 @@ import java.util.concurrent.TimeUnit
*/
@Suppress("LongParameterList", "TooManyFunctions")
class SyncedFolderAdapter(
private val lifecycleScope: LifecycleCoroutineScope,
private val context: Context,
private val clock: Clock,
private val gridWidth: Int,
Expand Down Expand Up @@ -313,15 +318,19 @@ class SyncedFolderAdapter(
}

private fun initNextScanIndicator(holder: HeaderViewHolder, syncedFolder: SyncedFolder) {
val scanIndicatorText = getNextScanIndicatorText(syncedFolder)
lifecycleScope.launch(Dispatchers.IO) {
val scanIndicatorText = getNextScanIndicatorText(syncedFolder)

holder.binding.scanIndicatorText.setVisibleIf(syncedFolder.isEnabled && (scanIndicatorText != null))
withContext(Dispatchers.Main) {
holder.binding.scanIndicatorText.setVisibleIf(syncedFolder.isEnabled && (scanIndicatorText != null))

if (holder.binding.scanIndicatorText.isVisible) {
setMaxWidthOfScanIndicatorText(holder)
holder.binding.scanIndicatorText.text = scanIndicatorText
} else {
setBottomMarginOfTitle(holder)
if (holder.binding.scanIndicatorText.isVisible) {
setMaxWidthOfScanIndicatorText(holder)
holder.binding.scanIndicatorText.text = scanIndicatorText
} else {
setBottomMarginOfTitle(holder)
}
}
}
}

Expand Down
Loading