Skip to content

Fix #6881: Add intent to Failed Upload notification to open Failed tab #6884

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

Open
Kishan8548 wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −5
Open

Fix #6881: Add intent to Failed Upload notification to open Failed tab #6884

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
7c1f130
Fix #6881: Add intent to Failed Upload notification to open Failed tab
Kishan8548 May 12, 2026
331dde8
Refactor: address Copilot suggestions for intent extras and menu inva…
Kishan8548 May 12, 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
12 changes: 11 additions & 1 deletion app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ class UploadProgressActivity : BaseActivity() {
},
)
setTabs()

val targetTab = intent.getIntExtra(EXTRA_TARGET_TAB, 0)
if (targetTab != 0) {
binding.uploadProgressViewPager.currentItem = targetTab
}
Comment thread
Kishan8548 marked this conversation as resolved.
}

/**
Expand All @@ -87,7 +92,7 @@ class UploadProgressActivity : BaseActivity() {
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.menu_uploads, menu)
this.menu = menu
updateMenuItems(0)
updateMenuItems(binding.uploadProgressViewPager.currentItem)
return super.onCreateOptionsMenu(menu)
}

Expand Down Expand Up @@ -208,4 +213,9 @@ class UploadProgressActivity : BaseActivity() {
isErrorIconsVisisble = visible
updateMenuItems(binding.uploadProgressViewPager.currentItem)
}

companion object {
const val EXTRA_TARGET_TAB = "upload_target_tab"
const val TAB_FAILED = 1
}
}
11 changes: 7 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ class UploadWorker(
@SuppressLint("StringFormatInvalid", "MissingPermission")
private fun showFailedNotification(contribution: Contribution) {
val displayTitle = contribution.media.displayTitle
currentNotification.setContentIntent(getPendingIntent(UploadProgressActivity::class.java))
currentNotification.setContentIntent(getPendingIntent(UploadProgressActivity::class.java, UploadProgressActivity.TAB_FAILED))
currentNotification
.setContentTitle(
Comment thread
Kishan8548 marked this conversation as resolved.
appContext.getString(
Expand Down Expand Up @@ -671,6 +671,7 @@ class UploadWorker(
@SuppressLint("StringFormatInvalid", "MissingPermission")
private fun showErrorNotification(contribution: Contribution) {
val displayTitle = contribution.media.displayTitle
currentNotification.setContentIntent(getPendingIntent(UploadProgressActivity::class.java, UploadProgressActivity.TAB_FAILED))
currentNotification
Comment thread
Kishan8548 marked this conversation as resolved.
.setContentTitle(
appContext.getString(
Expand Down Expand Up @@ -736,18 +737,20 @@ class UploadWorker(
/**
* Method used to get Pending intent for opening different screen after clicking on notification
* @param toClass
* @param targetTab
*/
private fun getPendingIntent(toClass: Class<out BaseActivity>): PendingIntent {
private fun getPendingIntent(toClass: Class<out BaseActivity>, targetTab: Int = 0): PendingIntent {
val intent = Intent(appContext, toClass)
intent.putExtra(UploadProgressActivity.EXTRA_TARGET_TAB, targetTab)
return TaskStackBuilder.create(appContext).run {
addNextIntentWithParentStack(intent)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
getPendingIntent(
0,
targetTab,
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
)
} else {
getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
getPendingIntent(targetTab, PendingIntent.FLAG_UPDATE_CURRENT)
}
}
}
Expand Down
Loading