Skip to content

fix(notification): open upload list for failed uploads #16790

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 2 commits into from
Apr 2, 2026
+12 −4
Merged

fix(notification): open upload list for failed uploads #16790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9a1882
fix(notification): open upload list for failed uploads
alperozturk96 Apr 1, 2026
dcfb3eb
add pending intent
alperozturk96 Apr 2, 2026
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
8 changes: 6 additions & 2 deletions app/src/main/java/com/nextcloud/client/jobs/utils/UploadErrorNotificationManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.core.app.NotificationCompat
import com.nextcloud.client.jobs.notification.WorkerNotificationManager
import com.nextcloud.client.jobs.upload.FileUploadHelper
import com.nextcloud.client.jobs.upload.UploadBroadcastAction
import com.nextcloud.client.notifications.AppWideNotificationManager
import com.nextcloud.utils.extensions.isConflict
import com.nextcloud.utils.extensions.isFileSpecificError
import com.owncloud.android.R
Expand Down Expand Up @@ -144,9 +145,12 @@ object UploadErrorNotificationManager {
)
}

if (result.code == ResultCode.UNAUTHORIZED) {
setContentIntent(credentialPendingIntent(context, operation))
val pendingIntent = if (result.code == ResultCode.UNAUTHORIZED) {
credentialPendingIntent(context, operation)
} else {
AppWideNotificationManager.getUploadListPendingIntent(context)
}
setContentIntent(pendingIntent)
}.build()
}

Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/com/nextcloud/client/notifications/AppWideNotificationManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,21 @@ object AppWideNotificationManager {

private const val SYNC_CONFLICT_NOTIFICATION_ID = 112

fun showSyncConflictNotification(context: Context) {
fun getUploadListPendingIntent(context: Context): PendingIntent {
val intent = Intent(context, UploadListActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
}

val pendingIntent = PendingIntent.getActivity(
return PendingIntent.getActivity(
context,
SYNC_CONFLICT_NOTIFICATION_INTENT_REQ_CODE,
intent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
}

fun showSyncConflictNotification(context: Context) {
val pendingIntent = getUploadListPendingIntent(context)

val actionIntent = Intent(context, SyncConflictNotificationBroadcastReceiver::class.java).apply {
putExtra(SyncConflictNotificationBroadcastReceiver.NOTIFICATION_ID, SYNC_CONFLICT_NOTIFICATION_ID)
Expand Down
Loading