Skip to content

fix(conflict-resolve): auto upload - #17245

Merged
alperozturk96 merged 1 commit into
masterfrom
fix/conflict-resolve-auto-upload
Aug 4, 2026
Merged

fix(conflict-resolve): auto upload#17245
alperozturk96 merged 1 commit into
masterfrom
fix/conflict-resolve-auto-upload

Conversation

@alperozturk96

@alperozturk96 alperozturk96 commented Jun 24, 2026

Copy link
Copy Markdown
Collaborator

Issue

During auto upload conflict resolution not working properly for local file selection

Changes

  • Pending intent flag changed to FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE since same operation can be used.
  • onNewIntent ConflictsResolveActivity since activity data needs to be reset for each new conflict.

@alperozturk96
alperozturk96 force-pushed the fix/conflict-resolve-auto-upload branch from 6f1024d to c4d67ba Compare July 14, 2026 12:36
@nextcloud nextcloud deleted a comment from github-actions Bot Jul 14, 2026
@alperozturk96 alperozturk96 mentioned this pull request Jul 14, 2026
Open
4 tasks done
@github-actions

github-actions Bot commented Jul 14, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/29333114801/artifacts/8311213099
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96
fix(conflict-resolve): auto upload
adddd35 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
alperozturk96 force-pushed the fix/conflict-resolve-auto-upload branch from c4d67ba to adddd35 Compare July 22, 2026 07:26
@github-actions

github-actions Bot commented Jul 22, 2026

Copy link
Copy Markdown

Codacy

SpotBugs

CategoryBaseNew
Bad practice3232
Correctness6666
Dodgy code213213
Experimental11
Malicious code vulnerability22
Multithreaded correctness2525
Performance4141
Security1919
Total399399

@github-actions

github-actions Bot commented Jul 22, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/29900202231/artifacts/8522061562
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@github-actions

github-actions Bot commented Jul 22, 2026

Copy link
Copy Markdown

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

@alperozturk96
alperozturk96 marked this pull request as draft July 22, 2026 09:01
@alperozturk96

alperozturk96 commented Jul 22, 2026

Copy link
Copy Markdown
Collaborator Author

Check activity flag and onResume usage.

@github-actions

github-actions Bot commented Jul 22, 2026

Copy link
Copy Markdown

master-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/17245-IT-master-10-02

@alperozturk96
alperozturk96 marked this pull request as ready for review August 4, 2026 11:26
@alperozturk96
alperozturk96 merged commit 391e1e6 into master Aug 4, 2026
17 of 23 checks passed
@alperozturk96
alperozturk96 deleted the fix/conflict-resolve-auto-upload branch August 4, 2026 11:26
@alperozturk96 alperozturk96 added this to the Nextcloud App 34.1.1 milestone Aug 4, 2026
@alperozturk96

alperozturk96 commented Aug 4, 2026

Copy link
Copy Markdown
Collaborator Author

/backport to stable-34.1.x

@backportbot backportbot Bot mentioned this pull request Aug 4, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tobiasKaminsky tobiasKaminsky tobiasKaminsky approved these changes

Assignees

No one assigned

Labels

3. to review

Projects

None yet

Milestone

Nextcloud App 34.1.1

Development

Successfully merging this pull request may close these issues.

2 participants

@alperozturk96 @tobiasKaminsky