Internal two way sync upload new files by tobiasKaminsky · Pull Request #17598 · nextcloud/android

tobiasKaminsky · 2026-09-09T13:04:25Z

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 · 2026-09-09T13:13:40Z

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

github-actions · 2026-09-09T13:44:44Z

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.
(please click on link to get QR code displayed)

tobiasKaminsky · 2026-09-09T14:07:26Z

Waiting for feedback in #13752

tobiasKaminsky · 2026-09-29T06:59:18Z

/backport to stable-35.0.x

github-actions · 2026-10-05T13:13:41Z

📱 QA build


Download	app-qa-debug.apk
QR code	Open the QR code for this download
Commit	`c2c3f50`
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.

codecov · 2026-10-06T10:25:30Z

Codecov Report

❌ Patch coverage is 62.27545% with 63 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...roid/operations/synchronize/TwoWaySyncOperation.kt	68.83%	11 Missing and 13 partials ⚠️
...ncloud/android/operations/UploadFileOperation.java	30.76%	16 Missing and 2 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 ⚠️
...m/nextcloud/client/jobs/upload/FileUploadHelper.kt	66.66%	1 Missing and 1 partial ⚠️
...om/nextcloud/client/jobs/InternalTwoWaySyncWork.kt	0.00%	1 Missing ⚠️

📢 Thoughts on this report? Let us know!

daniele-verducci · 2026-10-12T10:44:43Z

Screen_recording_20261012_124054.mp4

pr is updated

github-actions · 2026-10-12T12:03:46Z

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

github-actions · 2026-10-12T12:09:09Z

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

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

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

github-actions · 2026-10-12T12:38:46Z

stable22-IT test failed, but no output was generated. Maybe a preliminary stage failed.

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

github-actions · 2026-10-12T17:00:09Z

Codacy

SpotBugs

Category	Base	New
Bad practice	25	25
Correctness	52	52
Dodgy code	165	164
Experimental	1	1
Malicious code vulnerability	2	2
Multithreaded correctness	26	20
Performance	30	30
Security	16	16
Total	317	310

daniele-verducci

@alperozturk96 the reported problem is fixed. I made another half an hour of tests and it seems to work as expected! Thank you!

tobiasKaminsky added the 2. developing label Sep 9, 2026

tobiasKaminsky mentioned this pull request Sep 16, 2026

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

Closed

4 tasks done

tobiasKaminsky requested review from alperozturk96 and daniele-verducci and removed request for alperozturk96 September 29, 2026 06:59

tobiasKaminsky added 3. to review and removed 2. developing labels Sep 29, 2026

backportbot Bot added the backport-request label Sep 29, 2026

tobiasKaminsky requested a review from alperozturk96 October 5, 2026 09:16

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

alperozturk96 force-pushed the internalTwoWaySyncUploadNewFiles branch from 13088e1 to be3236d Compare October 5, 2026 13:49

nextcloud deleted a comment from github-actions Bot Oct 5, 2026

alperozturk96 force-pushed the internalTwoWaySyncUploadNewFiles branch 2 times, most recently from 799d753 to 9301570 Compare October 6, 2026 09:19

alperozturk96 approved these changes Oct 7, 2026

View reviewed changes

alperozturk96 added the AI assisted label Oct 7, 2026

This comment was marked as resolved.

Sign in to view

alperozturk96 force-pushed the internalTwoWaySyncUploadNewFiles branch 3 times, most recently from 694d610 to e2973d5 Compare October 12, 2026 11:33

alperozturk96 requested a review from daniele-verducci October 12, 2026 11:34

tobiasKaminsky and others added 13 commits October 12, 2026 14:34

Internal two way sync: upload new created files/folders

205b2bb

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

Internal two way sync: upload new created files/folders

bab01b7

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

use TwoWaySyncOperation.kt instead bloat SynchronizeFolderOperation.java

a4b898d

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

use UploadFileOperationFactory

5bb355b

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

handle if server: creates new folder

528b3ee

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

handle parent folder deletion and fix spotbugs

29ea643

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

handle parent folder deletion

a152a84

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

refactor test and prevent lock error on text file thus we can test

dd73b46

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

fix codacy

f3cb156

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

rename function for storage path that needed two way sync

e56c8db

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

add comment for isFolderDeletedLocally

e2049a5

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

check remote file as well for is file delete

566df06

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

add tests for edge case

f18d1c3

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

alperozturk96 force-pushed the internalTwoWaySyncUploadNewFiles branch from e2973d5 to f18d1c3 Compare October 12, 2026 12:34

alperozturk96 added 3 commits October 12, 2026 14:45

fix move operation

4e316e3

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

fix updated upload

6dc1152

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

fix rest uploads

c2c3f50

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

daniele-verducci approved these changes Oct 13, 2026

View reviewed changes

alperozturk96 merged commit 80e5b36 into master Oct 13, 2026
22 of 24 checks passed

alperozturk96 deleted the internalTwoWaySyncUploadNewFiles branch October 13, 2026 07:50

backportbot Bot mentioned this pull request Oct 13, 2026

[stable-35.0.x] Internal two way sync upload new files #17813

Merged

backportbot Bot removed the backport-request label Oct 13, 2026

Conversation

tobiasKaminsky commented Sep 9, 2026 • edited by daniele-verducci Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Expected behaviour

🤖 AI (if applicable)

Uh oh!

github-actions Bot commented Sep 9, 2026

Uh oh!

github-actions Bot commented Sep 9, 2026

Uh oh!

tobiasKaminsky commented Sep 9, 2026

Uh oh!

tobiasKaminsky commented Sep 29, 2026

Uh oh!

github-actions Bot commented Oct 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📱 QA build

Uh oh!

codecov Bot commented Oct 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

This comment was marked as resolved.

Uh oh!

daniele-verducci commented Oct 12, 2026

Uh oh!

github-actions Bot commented Oct 12, 2026

Uh oh!

github-actions Bot commented Oct 12, 2026

Uh oh!

github-actions Bot commented Oct 12, 2026

Uh oh!

github-actions Bot commented Oct 12, 2026

Codacy

SpotBugs

Uh oh!

daniele-verducci left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tobiasKaminsky commented Sep 9, 2026 •

edited by daniele-verducci

Loading

github-actions Bot commented Oct 5, 2026 •

edited

Loading

codecov Bot commented Oct 6, 2026 •

edited

Loading