Improve Two Way Sync Behaviour by alperozturk96 · Pull Request #13884 · nextcloud/android

alperozturk96 · 2024-10-26T08:20:29Z

Tests written, or not not needed

• Updates getInternalTwoWaySyncFolders() to return only folders, excluding the root directory, avoiding redundant checks in the worker.
• Adds a toggle to enable/disable two-way sync.
• Adds a dropdown menu to adjust the two-way sync interval.

app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt

app/src/main/java/com/nextcloud/client/jobs/InternalTwoWaySyncWork.kt

app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java

app/src/main/java/com/nextcloud/model/DurationOption.kt

ZetaTom

Everything seems to work during testing. Suggestions are mostly UI improvements.

(However, the worker still re-downloads everything on every run. This should be fixed by #13897.)

app/src/main/res/values/strings.xml

app/src/main/res/xml/preferences.xml

app/src/main/res/layout/internal_two_way_sync_layout.xml

app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java

app/src/main/res/layout/internal_two_way_sync_layout.xml

app/src/main/res/values/strings.xml

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>

app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt

app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt

app/src/main/res/xml/preferences.xml

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

ZetaTom

Everything works as expected on my device.

Please see my previous comment. If we agree, you will have my approval.

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

alperozturk96 · 2024-10-30T14:56:38Z

@tobiasKaminsky

Test regarding three-dot-menu visibility

f_test.mp4

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

github-actions · 2024-10-30T15:48:44Z

Codacy

Lint

Type	master	PR
Warnings	59	59
Errors	3	3

SpotBugs

Category	Base	New
Bad practice	65	65
Correctness	62	62
Dodgy code	300	299
Experimental	1	1
Internationalization	7	7
Malicious code vulnerability	1	1
Multithreaded correctness	6	6
Performance	53	53
Security	18	18
Total	513	512

Hannes-Schniz · 2024-10-30T16:47:54Z

Looking forward to this PR currently sync is not usable for me due to this feature missing since it just drains my battery

alperozturk96 · 2024-10-31T07:42:30Z

/backport to stable-3.30

alperozturk96 added the 2. developing label Oct 26, 2024

alperozturk96 mentioned this pull request Oct 26, 2024

Unwanted syncing of all files w/ 3.30.1 #13738

Closed

4 tasks

joshtrichards added the feature: sync label Oct 26, 2024

solonovamax reviewed Oct 27, 2024

View reviewed changes

alperozturk96 force-pushed the improve-two-way-sync-behaviour branch from 24fd59a to 2d8d1b0 Compare October 28, 2024 11:46

alperozturk96 added 3. to review and removed 2. developing labels Oct 28, 2024

alperozturk96 requested review from ZetaTom and tobiasKaminsky October 28, 2024 11:49

backportbot bot added the backport-request label Oct 29, 2024

ZetaTom reviewed Oct 29, 2024

View reviewed changes

alperozturk96 force-pushed the improve-two-way-sync-behaviour branch from 781449e to caa7f7f Compare October 29, 2024 10:56

alperozturk96 requested a review from ZetaTom October 29, 2024 14:20

alperozturk96 force-pushed the improve-two-way-sync-behaviour branch from 6d5e15f to e96e4f1 Compare October 29, 2024 14:20

ZetaTom added 3 commits October 30, 2024 09:51

Add disable all button to InternalTwoWaySyncActivity menu

dd7b08f

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>

Stop background job when cancelling two-way sync

a78607a

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>

Stop download worker when cancelling two-way sync

92c55ac

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>

tobiasKaminsky reviewed Oct 30, 2024

View reviewed changes

app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt Show resolved Hide resolved

tobiasKaminsky reviewed Oct 30, 2024

View reviewed changes

app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt Outdated Show resolved Hide resolved

tobiasKaminsky reviewed Oct 30, 2024

View reviewed changes

app/src/main/res/xml/preferences.xml Outdated Show resolved Hide resolved

tobiasKaminsky approved these changes Oct 30, 2024

View reviewed changes

alperozturk96 added 9 commits October 30, 2024 10:48

only sync folder

cd16043

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

only sync folder when internalFolderSyncTimestamp is bigger than 0

aee3c29

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

add ability to disable two way sync

73ea0e8

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

add toggle inside the two way sync activity

26d7a01

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

resetTwoWaySyncTimestamps at first run

a0f14bc

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

add resetTwoWaySyncTimestamps to app prefs

65bab5a

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

fix ui

5ba7713

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

add ability to set two way sync interval

bc0ccba

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

reschedule interval two way to dynamically change the interval time

6f6962e

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

alperozturk96 added 4 commits October 30, 2024 10:48

remove unused variables

ecd0194

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

use m3 only

76d4df6

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

revert preferences changes

832a63b

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

schedule two-way-sync via isTwoWaySyncEnabled

488589d

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

alperozturk96 force-pushed the improve-two-way-sync-behaviour branch from 5aca575 to 488589d Compare October 30, 2024 09:48

ZetaTom reviewed Oct 30, 2024

View reviewed changes

alperozturk96 added 9 commits October 30, 2024 12:02

use lifeCycleScope instead Coroutine scope

e48a336

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

better and more clear translation keys

4cec0fc

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

every user can cancel the worker

8431266

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

every user can cancel the worker

00509ef

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

use quantity strings

7ec7894

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

solving conflicts from connected PRs

c97082b

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

solve git conflicts

be70aef

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

dynamically hide menu item

5bb43f3

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

call on main thread- checkDisableForAllFoldersMenuButtonVisibility

2cc4e10

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

better thread management

81e5de6

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

tobiasKaminsky merged commit 54592b2 into master Oct 31, 2024

tobiasKaminsky deleted the improve-two-way-sync-behaviour branch October 31, 2024 06:09

backportbot bot mentioned this pull request Oct 31, 2024

[stable-3.30] Improve Two Way Sync Behaviour #13916

Closed

2 tasks

backportbot bot removed the backport-request label Oct 31, 2024

nextcloud deleted a comment from tobiasKaminsky Oct 31, 2024

backportbot bot added the backport-request label Oct 31, 2024

backportbot bot mentioned this pull request Oct 31, 2024

[stable-3.30] Improve Two Way Sync Behaviour #13918

Merged

backportbot bot removed the backport-request label Oct 31, 2024

alperozturk96 added this to the Nextcloud App 3.30.4 milestone Oct 31, 2024

Zocker1999NET mentioned this pull request Nov 5, 2024

[NOTICE] Version 3.30.1 Causing Sync Issues / Synchronising All Files #13872

Open

Uh oh!

Conversation

alperozturk96 commented Oct 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ZetaTom left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ZetaTom left a comment

Choose a reason for hiding this comment

Uh oh!

alperozturk96 commented Oct 30, 2024

Uh oh!

github-actions bot commented Oct 30, 2024

Codacy

Lint

SpotBugs

Uh oh!

Hannes-Schniz commented Oct 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alperozturk96 commented Oct 31, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

alperozturk96 commented Oct 26, 2024 •

edited

Loading

Hannes-Schniz commented Oct 30, 2024 •

edited

Loading