Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import android.util.Log
import android.widget.Toast
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkInfo
import androidx.work.WorkManager
import autodagger.AutoInjector
Expand Down Expand Up @@ -495,7 +495,7 @@ class AccountVerificationActivity : BaseActivity() {
val capabilitiesWork =
OneTimeWorkRequest.Builder(CapabilitiesWorker::class.java)
.setInputData(userData)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance().enqueue(capabilitiesWork)
}
Expand Down Expand Up @@ -591,7 +591,7 @@ class AccountVerificationActivity : BaseActivity() {
private fun deleteUserAndStartServerSelection(userId: Long) {
userManager.scheduleUserForDeletionWithId(userId).blockingGet()
val accountRemovalWork = OneTimeWorkRequest.Builder(AccountRemovalWorker::class.java)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance(applicationContext).enqueue(accountRemovalWork)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package com.nextcloud.talk.account.data.io
import android.content.Context
import androidx.lifecycle.LiveData
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkInfo
import androidx.work.WorkManager
import com.nextcloud.talk.account.data.model.LoginCompletion
Expand All @@ -33,7 +33,7 @@ class LocalLoginDataSource(val userManager: UserManager, val appPreferences: App

fun startAccountRemovalWorker(): LiveData<WorkInfo?> {
val accountRemovalWork = OneTimeWorkRequest.Builder(AccountRemovalWorker::class.java)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance(context).enqueue(accountRemovalWork)

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ import androidx.media3.session.SessionToken
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkInfo
import androidx.work.WorkManager
import autodagger.AutoInjector
Expand Down Expand Up @@ -2380,7 +2380,7 @@ class ChatActivity :
val downloadWorker: OneTimeWorkRequest = OneTimeWorkRequest.Builder(DownloadFileToCacheWorker::class.java)
.setInputData(data)
.addTag(fileId)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()

WorkManager.getInstance().enqueue(downloadWorker)
Expand Down Expand Up @@ -2538,7 +2538,7 @@ class ChatActivity :
.build()
val worker = OneTimeWorkRequest.Builder(ShareOperationWorker::class.java)
.setInputData(data)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance().enqueue(worker)
}
Expand Down Expand Up @@ -3344,7 +3344,7 @@ class ChatActivity :
val deleteConversationWorker =
OneTimeWorkRequest.Builder(DeleteConversationWorker::class.java)
.setInputData(data.build())
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance().enqueue(deleteConversationWorker)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.work.Data
import androidx.work.ExistingWorkPolicy
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkInfo
import androidx.work.WorkManager
import autodagger.AutoInjector
Expand Down Expand Up @@ -504,7 +504,7 @@ class ConversationInfoActivity : BaseActivity() {
val addParticipantsWorker =
OneTimeWorkRequest.Builder(AddParticipantsToConversationWorker::class.java)
.setInputData(data)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance().enqueue(addParticipantsWorker)
WorkManager.getInstance(context).getWorkInfoByIdLiveData(addParticipantsWorker.id)
Expand All @@ -519,7 +519,7 @@ class ConversationInfoActivity : BaseActivity() {
workerData?.let { data ->
val workRequest = OneTimeWorkRequest.Builder(LeaveConversationWorker::class.java)
.setInputData(data)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance(context).enqueueUniqueWork(
"leave_conversation_work",
Expand Down Expand Up @@ -594,7 +594,7 @@ class ConversationInfoActivity : BaseActivity() {
WorkManager.getInstance(context).enqueue(
OneTimeWorkRequest.Builder(DeleteConversationWorker::class.java)
.setInputData(it)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkInfo
import androidx.work.WorkManager
import autodagger.AutoInjector
Expand Down Expand Up @@ -1256,7 +1256,7 @@ class ConversationsListActivity : BaseActivity() {
.build()
val worker = OneTimeWorkRequest.Builder(LeaveConversationWorker::class.java)
.setInputData(data)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance().enqueue(worker)
WorkManager.getInstance(this).getWorkInfoByIdLiveData(worker.id).observeForever { workInfo ->
Expand Down Expand Up @@ -1362,7 +1362,7 @@ class ConversationsListActivity : BaseActivity() {
private fun deleteUserAndRestartApp() {
userManager.scheduleUserForDeletionWithId(currentUser!!.id!!).blockingGet()
val accountRemovalWork = OneTimeWorkRequest.Builder(AccountRemovalWorker::class.java)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance(applicationContext).enqueue(accountRemovalWork)

Expand Down Expand Up @@ -1502,7 +1502,7 @@ class ConversationsListActivity : BaseActivity() {
val deleteConversationWorker =
OneTimeWorkRequest.Builder(DeleteConversationWorker::class.java)
.setInputData(data.build())
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance().enqueue(deleteConversationWorker)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import androidx.work.CoroutineWorker
import androidx.work.Data
import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkManager
import androidx.work.WorkRequest
import androidx.work.WorkerParameters
Expand Down Expand Up @@ -148,7 +148,7 @@ class ChatMessageCatchUpWorker(context: Context, workerParams: WorkerParameters)
.setInputData(data)
.setConstraints(Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
.setBackoffCriteria(BackoffPolicy.EXPONENTIAL, WorkRequest.MIN_BACKOFF_MILLIS, TimeUnit.MILLISECONDS)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()

WorkManager.getInstance(context).enqueue(catchUpWork)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import android.content.Context
import android.util.Log
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkManager
import androidx.work.Worker
import androidx.work.WorkerParameters
Expand Down Expand Up @@ -287,7 +287,7 @@ class PushRegistrationWorker(context: Context, workerParams: WorkerParameters) :
.build()
val notificationWork =
OneTimeWorkRequest.Builder(NotificationWorker::class.java).setInputData(messageData)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance(applicationContext).enqueue(notificationWork)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import android.content.Context
import android.util.Log
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkManager
import androidx.work.Worker
import androidx.work.WorkerParameters
Expand Down Expand Up @@ -120,7 +120,7 @@ class ShareOperationWorker(context: Context, workerParams: WorkerParameters) : W
.build()
val shareWorker = OneTimeWorkRequest.Builder(ShareOperationWorker::class.java)
.setInputData(data)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance().enqueue(shareWorker)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import androidx.lifecycle.asFlow
import androidx.lifecycle.viewModelScope
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkInfo
import androidx.work.WorkManager
import com.nextcloud.talk.application.NextcloudTalkApplication
Expand Down Expand Up @@ -152,7 +152,7 @@ class MediaViewerViewModel @Inject constructor(private val sharedItemsRepository
val request = OneTimeWorkRequest.Builder(DownloadFileToCacheWorker::class.java)
.setInputData(data)
.addTag(item.fileId)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance(context).enqueue(request)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package com.nextcloud.talk.services
import android.util.Log
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkManager
import com.nextcloud.talk.jobs.NotificationWorker
import com.nextcloud.talk.jobs.PushRegistrationWorker
Expand Down Expand Up @@ -56,7 +56,7 @@ class UnifiedPushService : PushService() {
.build()
val notificationWork =
OneTimeWorkRequest.Builder(NotificationWorker::class.java).setInputData(messageData)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance(this).enqueue(notificationWork)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import androidx.core.net.toUri
import androidx.core.view.ViewCompat
import androidx.lifecycle.lifecycleScope
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkInfo
import androidx.work.WorkManager
import autodagger.AutoInjector
Expand Down Expand Up @@ -311,7 +311,7 @@ class SettingsActivity :

private fun loadCapabilitiesAndUpdateSettings(isOnline: Boolean) {
val capabilitiesWork = OneTimeWorkRequest.Builder(CapabilitiesWorker::class.java)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance(context).enqueue(capabilitiesWork)

Expand Down Expand Up @@ -988,7 +988,7 @@ class SettingsActivity :
private fun removeCurrentAccount() {
userManager.scheduleUserForDeletionWithId(currentUser!!.id!!).blockingGet()
val accountRemovalWork = OneTimeWorkRequest.Builder(AccountRemovalWorker::class.java)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance(applicationContext).enqueue(accountRemovalWork)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import com.nextcloud.talk.utils.setExpeditedIfSupported
import androidx.work.WorkInfo
import androidx.work.WorkManager
import autodagger.AutoInjector
Expand Down Expand Up @@ -99,7 +99,7 @@ class SaveToStorageDialogFragment : DialogFragment() {
val saveWorker: OneTimeWorkRequest = OneTimeWorkRequest.Builder(SaveFileToStorageWorker::class.java)
.setInputData(data)
.addTag(workerTag)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()

WorkManager.getInstance().enqueue(saveWorker)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import androidx.emoji2.widget.EmojiTextView
import androidx.lifecycle.Observer
import androidx.work.Data
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
import androidx.work.WorkInfo
import androidx.work.WorkManager
import com.google.android.material.snackbar.Snackbar
Expand Down Expand Up @@ -358,7 +357,7 @@ class FileViewerUtils(private val context: Context, private val user: User) {
downloadWorker = OneTimeWorkRequest.Builder(DownloadFileToCacheWorker::class.java)
.setInputData(data)
.addTag(fileInfo.fileId)
.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
.setExpeditedIfSupported()
.build()
WorkManager.getInstance().enqueue(downloadWorker)
val liveData = WorkManager.getInstance(context).getWorkInfoByIdLiveData(downloadWorker.id)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Nextcloud Talk - Android Client
*
* SPDX-FileCopyrightText: 2026 Marcel Hibbe <dev@mhibbe.de>
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package com.nextcloud.talk.utils

import android.os.Build
import androidx.work.OutOfQuotaPolicy
import androidx.work.WorkRequest

/**
* Marks the request as expedited, but only on API 31+ (Android 12), where expedited work is
* backed by JobScheduler's expedited job support and does not require the Worker to implement
* getForegroundInfo(). On older APIs, expedited work falls back to an implicit foreground
* service and WorkManager throws IllegalStateException if getForegroundInfo() isn't overridden,
* which none of our Workers do.
*/
fun <B : WorkRequest.Builder<B, W>, W : WorkRequest> B.setExpeditedIfSupported(): B =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
} else {
this
}
Loading