mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11655 from nextcloud/dependabot/gradle/io.coil-kt-coil-2.4.0

Browse source 
Build(deps): Bump io.coil-kt:coil from 2.2.2 to 2.4.0
This commit is contained in:
Andy Scherzinger 2023-05-25 15:22:25 +02:00 committed by GitHub
commit ae2c57ba46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -374,7 +374,7 @@ dependencies {
kapt "androidx.room:room-compiler:$roomVersion" kapt "androidx.room:room-compiler:$roomVersion"
androidTestImplementation "androidx.room:room-testing:$roomVersion" androidTestImplementation "androidx.room:room-testing:$roomVersion"
implementation "io.coil-kt:coil:2.2.2" implementation "io.coil-kt:coil:2.4.0"
} }
configurations.all { configurations.all {

12
app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt
View file

@ -23,7 +23,7 @@ import android.os.Build
import android.provider.MediaStore import android.provider.MediaStore
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.Transformations import androidx.lifecycle.map
import androidx.work.Constraints import androidx.work.Constraints
import androidx.work.Data import androidx.work.Data
import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.ExistingPeriodicWorkPolicy
@ -193,7 +193,7 @@ internal class BackgroundJobManagerImpl(
private fun WorkManager.getJobInfo(id: UUID): LiveData<JobInfo?> { private fun WorkManager.getJobInfo(id: UUID): LiveData<JobInfo?> {
val workInfo = getWorkInfoByIdLiveData(id) val workInfo = getWorkInfoByIdLiveData(id)
return Transformations.map(workInfo) { fromWorkInfo(it) } return workInfo.map { fromWorkInfo(it) }
} }
/** /**
@ -208,9 +208,7 @@ internal class BackgroundJobManagerImpl(
override val jobs: LiveData<List<JobInfo>> override val jobs: LiveData<List<JobInfo>>
get() { get() {
val workInfo = workManager.getWorkInfosByTagLiveData("*") val workInfo = workManager.getWorkInfosByTagLiveData("*")
return Transformations.map(workInfo) { return workInfo.map { it -> it.map { fromWorkInfo(it) ?: JobInfo() }.sortedBy { it.started }.reversed() }
it.map { fromWorkInfo(it) ?: JobInfo() }.sortedBy { it.started }.reversed()
}
} }
@RequiresApi(Build.VERSION_CODES.N) @RequiresApi(Build.VERSION_CODES.N)
@ -463,9 +461,7 @@ internal class BackgroundJobManagerImpl(
override fun getFileUploads(user: User): LiveData<List<JobInfo>> { override fun getFileUploads(user: User): LiveData<List<JobInfo>> {
val workInfo = workManager.getWorkInfosByTagLiveData(formatNameTag(JOB_FILES_UPLOAD, user)) val workInfo = workManager.getWorkInfosByTagLiveData(formatNameTag(JOB_FILES_UPLOAD, user))
return Transformations.map(workInfo) { return workInfo.map { it -> it.map { fromWorkInfo(it) ?: JobInfo() } }
it.map { fromWorkInfo(it) ?: JobInfo() }
}
} }
override fun startPdfGenerateAndUploadWork( override fun startPdfGenerateAndUploadWork(