Skip to content

Internal two way sync upload new files - #17598

Open
tobiasKaminsky wants to merge 11 commits into
masterfrom
internalTwoWaySyncUploadNewFiles
Open

Internal two way sync upload new files#17598
tobiasKaminsky wants to merge 11 commits into
masterfrom
internalTwoWaySyncUploadNewFiles

Conversation

@tobiasKaminsky

@tobiasKaminsky tobiasKaminsky commented Sep 9, 2026 •
edited by alperozturk96
Loading

Copy link
Copy Markdown
Member

Fix #13752

Expected behaviour

  • Create a file in the folder with another app
  • Create a folder with files inside, with another app
  • Edit a downloaded file with another app
  • Delete a downloaded file with another app
  • Create, edit or delete a file on the web
  • Create nested folders on the web (a/b/file) -> app should sync with the latest state
  • Edit the same file on the phone and the web -> app should mark it as a conflict; neither side is overwritten
  • Deletes a synced folder on the web -> app should never re-create
  • Syncs again without changes -> app should do nothing

To testing "run sync now" can be used from Settings.

🤖 AI (if applicable)

  • The content of this PR was partly or fully generated using AI (N/A)

@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

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

@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/34354803647/artifacts/10106974799
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)

@tobiasKaminsky

tobiasKaminsky commented Sep 9, 2026

Copy link
Copy Markdown
Member Author

Waiting for feedback in #13752

@tobiasKaminsky tobiasKaminsky mentioned this pull request Sep 16, 2026
Open
4 tasks done
@tobiasKaminsky
tobiasKaminsky requested review from alperozturk96 and daniele-verducci and removed request for alperozturk96 September 29, 2026 06:59
@tobiasKaminsky

tobiasKaminsky commented Sep 29, 2026

Copy link
Copy Markdown
Member Author

/backport to stable-35.0.x

@alperozturk96
alperozturk96 force-pushed the internalTwoWaySyncUploadNewFiles branch from 69d9ed6 to f991668 Compare October 5, 2026 13:03
@github-actions

github-actions Bot commented Oct 5, 2026 •
edited
Loading

Copy link
Copy Markdown

📱 QA build
Download app-qa-debug.apk
QR code Open the QR code for this download
Commit d0cf122
Version 17598
Available until 7 days after this build

The QA build installs alongside a released Nextcloud app, so you can keep
using your existing install while testing.

Downloading the file requires a GitHub account, so open this link on the
device you want to test on, or transfer the APK to it.

@alperozturk96
alperozturk96 force-pushed the internalTwoWaySyncUploadNewFiles branch from 13088e1 to be3236d Compare October 5, 2026 13:49
@nextcloud nextcloud deleted a comment from github-actions Bot Oct 5, 2026
@github-actions

github-actions Bot commented Oct 5, 2026

Copy link
Copy Markdown

stable22-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/17598-IT-stable22-14-44

@github-actions

github-actions Bot commented Oct 5, 2026

Copy link
Copy Markdown

stable35-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/17598-IT-stable35-14-48

@github-actions

github-actions Bot commented Oct 5, 2026

Copy link
Copy Markdown

master-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/17598-IT-master-14-51

@alperozturk96
alperozturk96 force-pushed the internalTwoWaySyncUploadNewFiles branch from fdea366 to 7439520 Compare October 6, 2026 08:43
tobiasKaminsky and others added 8 commits October 6, 2026 11:19
@tobiasKaminsky @alperozturk96
Internal two way sync: upload new created files/folders
f2239d9 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

# Conflicts:
#	app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java
#	app/src/main/res/values/strings.xml
@tobiasKaminsky @alperozturk96
Internal two way sync: upload new created files/folders
430cd85 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@alperozturk96
use TwoWaySyncOperation.kt instead bloat SynchronizeFolderOperation.java
1428e24 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
use UploadFileOperationFactory
d36bef4 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
handle if server: creates new folder
d75d249 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
handle parent folder deletion and fix spotbugs
ee4edae 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
handle parent folder deletion
cf2e6cf 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
refactor test and prevent lock error on text file thus we can test
9301570 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
alperozturk96 force-pushed the internalTwoWaySyncUploadNewFiles branch from 799d753 to 9301570 Compare October 6, 2026 09:19
@alperozturk96
fix codacy
4f8b844 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
rename function for storage path that needed two way sync
9a7ebbf 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@codecov

codecov Bot commented Oct 6, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 68.18182% with 42 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...roid/operations/synchronize/TwoWaySyncOperation.kt 68.91% 11 Missing and 12 partials ⚠️
...android/operations/SynchronizeFolderOperation.java 79.41% 4 Missing and 3 partials ⚠️
.../nextcloud/client/jobs/BackgroundJobManagerImpl.kt 0.00% 5 Missing ⚠️
...com/nextcloud/utils/extensions/OCFileExtensions.kt 57.14% 2 Missing and 1 partial ⚠️
.../android/ui/activity/InternalTwoWaySyncActivity.kt 0.00% 3 Missing ⚠️
...om/nextcloud/client/jobs/InternalTwoWaySyncWork.kt 0.00% 1 Missing ⚠️

📢 Thoughts on this report? Let us know!

@alperozturk96
add comment for isFolderDeletedLocally
d0cf122 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@github-actions

github-actions Bot commented Oct 6, 2026

Copy link
Copy Markdown

Codacy

SpotBugs

CategoryBaseNew
Bad practice3030
Correctness5454
Dodgy code177177
Experimental11
Malicious code vulnerability22
Multithreaded correctness2620
Performance3535
Security1616
Total341335

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daniele-verducci daniele-verducci Awaiting requested review from daniele-verducci
@alperozturk96 alperozturk96 Awaiting requested review from alperozturk96

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

3. to review backport-request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Internal 2-way sync does not pick up files / folders created/modified/deleted outside nextcloud app

2 participants

@tobiasKaminsky @alperozturk96