Skip to content

fix(conflict-resolve): auto upload #17245

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
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −1
Open

fix(conflict-resolve): auto upload #17245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 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 @@ -210,7 +210,7 @@ object UploadErrorNotificationManager {
context,
operation.ocUploadId.toInt(),
intent,
PendingIntent.FLAG_IMMUTABLE
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
}
}
16 changes: 16 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,22 @@ class ConflictsResolveActivity :
offlineOperationNotificationManager = OfflineOperationsNotificationManager(this, viewThemeUtils)
}

override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)

setIntent(intent)

// re-read extras from new intent
restoreState(null)

// force fresh remote file fetch in onStart
existingFile = null

val upload = uploadsStorageManager.getUploadById(conflictUploadId)
newFile = file
setupDecisionListener(upload)
}

private fun restoreState(savedInstanceState: Bundle?) {
if (savedInstanceState != null) {
conflictUploadId = savedInstanceState.getLong(EXTRA_CONFLICT_UPLOAD_ID)
Expand Down
Loading