alperozturk
|
be70aef0fe
|
solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 14:06:06 +01:00 |
|
Tobias Kaminsky
|
861787348c
|
Merge pull request #13905 from nextcloud/feature/two_way_sync_stop_all
Add disable all button to InternalTwoWaySyncActivity menu
|
2024-10-30 14:02:11 +01:00 |
|
alperozturk
|
c97082b172
|
solving conflicts from connected PRs
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 13:57:55 +01:00 |
|
alperozturk
|
7ec78948a7
|
use quantity strings
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:33:43 +01:00 |
|
alperozturk
|
5137bc6574
|
every user can cancel the worker
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:14:14 +01:00 |
|
alperozturk
|
043c8b390e
|
every user can cancel the worker
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:14:14 +01:00 |
|
alperozturk
|
0454a2c570
|
better and more clear translation keys
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:14:14 +01:00 |
|
alperozturk
|
7b6caf0685
|
use lifeCycleScope instead Coroutine scope
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:14:14 +01:00 |
|
ZetaTom
|
84c7cdbf56
|
Stop download worker when cancelling two-way sync
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 12:14:14 +01:00 |
|
ZetaTom
|
b3845560a0
|
Stop background job when cancelling two-way sync
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 12:14:14 +01:00 |
|
ZetaTom
|
1fc4f51fd1
|
Add disable all button to InternalTwoWaySyncActivity menu
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 12:14:14 +01:00 |
|
alperozturk
|
00509efa02
|
every user can cancel the worker
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:07:37 +01:00 |
|
alperozturk
|
8431266caa
|
every user can cancel the worker
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:07:26 +01:00 |
|
alperozturk
|
4cec0fc6e0
|
better and more clear translation keys
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:02:28 +01:00 |
|
alperozturk
|
e48a3365b1
|
use lifeCycleScope instead Coroutine scope
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:02:18 +01:00 |
|
Tobias Kaminsky
|
d21321e1d6
|
Merge pull request #13895 from nextcloud/bugfix/auto-rename-capability-order
BugFix / AutoRename Capability Order
|
2024-10-30 12:02:16 +01:00 |
|
Tobias Kaminsky
|
733f9cdfd9
|
Merge pull request #13494 from nextcloud/emptyList
2way sync: Better view handling
|
2024-10-30 11:29:48 +01:00 |
|
ZetaTom
|
c32881ed60
|
Fix XML SPDX header.
- remove Talk
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 11:24:33 +01:00 |
|
alperozturk
|
488589d2a7
|
schedule two-way-sync via isTwoWaySyncEnabled
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
832a63b5a6
|
revert preferences changes
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
76d4df6d15
|
use m3 only
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
ecd0194160
|
remove unused variables
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
3fda8d3567
|
use string arguments
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
Alper Öztürk
|
8b499fbe5d
|
Update app/src/main/res/xml/preferences.xml
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
|
2024-10-30 10:48:55 +01:00 |
|
Alper Öztürk
|
b1c720b28f
|
Update app/src/main/res/values/strings.xml
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
c84f926329
|
make switch smaller
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
c98a720950
|
remove reset column function due to "remove all" button will be added in three dot menu
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
1b6073d0de
|
use kotlin.Duration
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
f0a8400cec
|
rename filedao function
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
67b78283f2
|
set default two way sync value to true
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
a413005cb9
|
run resetTwoWaySyncTimestamps in background thread
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
095e5da242
|
update periodic work policy for new interval
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
e39e0ba623
|
fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
010e03e7d1
|
show selectedDuration in drop down menu
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
0bb1960b32
|
fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
6f6962ef04
|
reschedule interval two way to dynamically change the interval time
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
bc0ccba3ce
|
add ability to set two way sync interval
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
5ba7713aea
|
fix ui
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
65bab5a39d
|
add resetTwoWaySyncTimestamps to app prefs
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
a0f14bc778
|
resetTwoWaySyncTimestamps at first run
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
26d7a0111a
|
add toggle inside the two way sync activity
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
73ea0e81e5
|
add ability to disable two way sync
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
aee3c290d0
|
only sync folder when internalFolderSyncTimestamp is bigger than 0
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
cd16043508
|
only sync folder
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
A117870935
|
5f578c4f8c
|
Fix: Launching LauncherActivity & FirstRunActivity
Signed-off-by: A117870935 <surinder.kumar@t-systems.com>
|
2024-10-30 15:00:12 +05:30 |
|
ZetaTom
|
92c55acf19
|
Stop download worker when cancelling two-way sync
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 09:54:11 +01:00 |
|
ZetaTom
|
a78607a6e9
|
Stop background job when cancelling two-way sync
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 09:53:32 +01:00 |
|
Tobias Kaminsky
|
2e03e22497
|
Merge pull request #13897 from nextcloud/bugfix/unnecessary-sync
BugFix - Unnecessary Sync
|
2024-10-30 09:53:17 +01:00 |
|
ZetaTom
|
dd7b08ff7a
|
Add disable all button to InternalTwoWaySyncActivity menu
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 09:51:23 +01:00 |
|
Nextcloud bot
|
1fa3f7243e
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2024-10-30 02:48:31 +00:00 |
|