Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Implement deleteStaleCachedMedia as a suspending function (#490) 

Previously a regular function launched with an rxJava scheduler, now
it's a suspending function that enforces Dispatchers.IO as the context,
launched in its own coroutine.
This commit is contained in:
Nik Clayton 2024-03-03 17:02:23 +01:00 committed by GitHub
parent 1026fccc40
commit 900b1728bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/app/pachli/MainActivity.kt
View File

@ -70,6 +70,7 @@ import app.pachli.core.activity.AccountSelectionListener
import app.pachli.core.activity.BottomSheetActivity import app.pachli.core.activity.BottomSheetActivity
import app.pachli.core.activity.PostLookupFallbackBehavior import app.pachli.core.activity.PostLookupFallbackBehavior
import app.pachli.core.activity.emojify import app.pachli.core.activity.emojify
import app.pachli.core.common.di.ApplicationScope
import app.pachli.core.common.extensions.hide import app.pachli.core.common.extensions.hide
import app.pachli.core.common.extensions.show import app.pachli.core.common.extensions.show
import app.pachli.core.common.extensions.viewBinding import app.pachli.core.common.extensions.viewBinding
@ -153,13 +154,17 @@ import com.mikepenz.materialdrawer.util.updateBadge
import com.mikepenz.materialdrawer.widget.AccountHeaderView import com.mikepenz.materialdrawer.widget.AccountHeaderView
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import de.c1710.filemojicompat_ui.helpers.EMOJI_PREFERENCE import de.c1710.filemojicompat_ui.helpers.EMOJI_PREFERENCE
import io.reactivex.rxjava3.schedulers.Schedulers
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import timber.log.Timber import timber.log.Timber
@AndroidEntryPoint @AndroidEntryPoint
class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
@Inject
@ApplicationScope
lateinit var externalScope: CoroutineScope
@Inject @Inject
lateinit var eventHub: EventHub lateinit var eventHub: EventHub
@ -346,7 +351,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
} }
} }
Schedulers.io().scheduleDirect { externalScope.launch {
// Flush old media that was cached for sharing // Flush old media that was cached for sharing
deleteStaleCachedMedia(applicationContext.getExternalFilesDir("Pachli")) deleteStaleCachedMedia(applicationContext.getExternalFilesDir("Pachli"))
} }

8
app/src/main/java/app/pachli/util/MediaUtils.kt
View File

@ -31,6 +31,8 @@ import java.text.SimpleDateFormat
import java.util.Calendar import java.util.Calendar
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import timber.log.Timber import timber.log.Timber
/** /**
@ -165,10 +167,10 @@ fun getImageOrientation(uri: Uri, contentResolver: ContentResolver): Int {
} }
} }
fun deleteStaleCachedMedia(mediaDirectory: File?) { suspend fun deleteStaleCachedMedia(mediaDirectory: File?) = withContext(Dispatchers.IO) {
if (mediaDirectory == null || !mediaDirectory.exists()) { if (mediaDirectory == null || !mediaDirectory.exists()) {
// Nothing to do // Nothing to do
return return@withContext
} }
val twentyfourHoursAgo = Calendar.getInstance() val twentyfourHoursAgo = Calendar.getInstance()
@ -182,7 +184,7 @@ fun deleteStaleCachedMedia(mediaDirectory: File?) {
} }
if (files == null || files.isEmpty()) { if (files == null || files.isEmpty()) {
// Nothing to do // Nothing to do
return return@withContext
} }
for (file in files) { for (file in files) {