Skip to content
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

Jump to bottom

Update Thumbnail After Resolving Conflict #14556

Merged
merged 2 commits into from
Feb 26, 2025
Merged

Update Thumbnail After Resolving Conflict #14556

merged 2 commits into from
Feb 26, 2025
+8 −0

Conversation

alperozturk96
Copy link
Collaborator

@alperozturk96 alperozturk96 commented Feb 17, 2025 •
edited
Loading

  • Tests written, or not not needed

Issue

Keep both option from conflict dialog needs hard refresh to get file added.

Step to reproduce

  1. Create folder and upload some file(eg- test1.jpg file)
  2. Upload same file name again with different content
  3. Check both to keep both files from conflict dialog, and wait to get uploaded
Screen.Recording.2025-02-17.at.13.01.46.mp4
kb2.mp4

@alperozturk96 alperozturk96 mentioned this pull request Feb 17, 2025
Closed
1 task
@alperozturk96 alperozturk96 force-pushed the update-thumbnail-if-needed-after-conflict-resolve branch 2 times, most recently from ae63617 to af4bfd1 Compare February 24, 2025 08:14
@alperozturk96 alperozturk96 added this to the Nextcloud App 3.31.0 milestone Feb 24, 2025
@alperozturk96 alperozturk96 removed this from the Nextcloud App 3.31.0 milestone Feb 24, 2025
@alperozturk96 alperozturk96 force-pushed the update-thumbnail-if-needed-after-conflict-resolve branch from af4bfd1 to 2582e51 Compare February 25, 2025 08:03
@github-actions GitHub Actions
Copy link

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14556.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

@github-actions GitHub Actions
Copy link

Codacy

Lint

TypemasterPR
Warnings5454
Errors33

SpotBugs

CategoryBaseNew
Bad practice6565
Correctness5858
Dodgy code294294
Experimental11
Internationalization77
Malicious code vulnerability11
Multithreaded correctness77
Performance5151
Security1818
Total502502

@tobiasKaminsky tobiasKaminsky merged commit 4e14d2c into master Feb 26, 2025
19 of 21 checks passed
@tobiasKaminsky tobiasKaminsky deleted the update-thumbnail-if-needed-after-conflict-resolve branch February 26, 2025 09:20
@tobiasKaminsky
Copy link
Member

/backport to stable-3.31

@backportbot backportbot bot mentioned this pull request Feb 26, 2025
Open
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

@ZetaTom ZetaTom ZetaTom approved these changes

Assignees
No one assigned
Labels
3. to review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alperozturk96 @tobiasKaminsky @ZetaTom