Commit graph

5317 commits

Author SHA1 Message Date
Tobias Kaminsky
4c1c6f1bf4 daily dev 20240713 2024-07-13 02:37:27 +02:00
Tobias Kaminsky
0f97906ec7 Merge remote-tracking branch 'origin/master' into dev 2024-07-13 02:31:02 +02:00
Andy Scherzinger
666a4188a5
Merge pull request #13254 from nextcloud/bugfix/e2e-file-conflict-duplicated-files
Bug-Fix E2E File Conflict Duplicated Files
2024-07-12 13:22:15 +02:00
alperozturk
f245e36ce4 Update license
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 09:03:04 +02:00
alperozturk
8e746617f2 Fix and convert to kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 09:03:04 +02:00
alperozturk
7a9a92b845 Rename .java to .kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 09:03:04 +02:00
alperozturk
d9a24d6257
Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:59:51 +02:00
alperozturk
8a54508dc2 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
7fcb689634 Do the remove operation inside the upload file operations only for encrypted folder
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
fd6cdbdf44 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
45ca46557a Check parent folder
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
11cc3cdc63 Add documentation
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
4ffa1891e1 Better naming
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
47cd4b2fd5 Adopt to async execution
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
bc563681b4 removeAnyOtherFileHaveSameName
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
Alper Öztürk
dad6486a06
Merge pull request #13255 from nextcloud/13035-only-pictures-are-enabled-but-videos-also-auto-synced
Check for right media type in auto upload
2024-07-12 08:55:32 +02:00
Nextcloud bot
b2da0cdfb7
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-12 02:41:27 +00:00
Jonas Mayer
86ddaa3b5b Merge remote-tracking branch 'origin/13035-only-pictures-are-enabled-but-videos-also-auto-synced' into 13035-only-pictures-are-enabled-but-videos-also-auto-synced
# Conflicts:
#	app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java
2024-07-11 18:24:31 +02:00
Jonas Mayer
55526cb5cc renamed containsFile function
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-11 18:15:19 +02:00
Jonas Mayer
700dd54014 Check for right media type
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-09 17:10:31 +02:00
Nextcloud bot
ea5046ac71
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-09 02:40:04 +00:00
Tobias Kaminsky
d46c7b8154 daily dev 20240709 2024-07-09 02:37:19 +02:00
Tobias Kaminsky
3b57d5085a Merge remote-tracking branch 'origin/master' into dev 2024-07-09 02:31:08 +02:00
Alper Öztürk
c6c96ca25a
Merge pull request #13248 from nextcloud/bugfix/set-default-account
Bug-Fix Set Default Account Instead Using Lateinit Variable
2024-07-08 18:28:25 +02:00
alperozturk
a2f8264396
Remove deprecated function and replace with onViewCreated
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:25:57 +02:00
alperozturk
96fee3e8ed
Fix
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:23:23 +02:00
alperozturk
4a5eb4c66e
Fix
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:11:08 +02:00
alperozturk
f27fb2186e
Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:06:29 +02:00
alperozturk
d982ae2e7a
Fix test
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:05:55 +02:00
alperozturk
e839759bd4 Fix
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 14:23:55 +02:00
nicofrand
34f168280e
Reload rich document edition on reload event from webview (triggered on session expiration)
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-07-08 13:01:00 +02:00
Jonas Mayer
3db4443e9f Check for right media type
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-08 12:00:31 +02:00
Nextcloud bot
28d3891f65
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-08 02:41:11 +00:00
Tobias Kaminsky
a4952752f6 daily dev 20240706 2024-07-06 02:36:56 +02:00
Tobias Kaminsky
63cdd63874 Merge remote-tracking branch 'origin/master' into dev 2024-07-06 02:30:54 +02:00
renovate[bot]
dfe06650c2
fix(deps): update dependency androidx.lifecycle:lifecycle-viewmodel-ktx to v2.8.3
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-05 16:24:55 +00:00
renovate[bot]
39aff1f2fe
fix(deps): update dependency androidx.lifecycle:lifecycle-service to v2.8.3
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-05 14:35:28 +00:00
Alper Öztürk
139b6e4708
Merge pull request #13230 from nextcloud/bugfix/reach-data-after-operation-failed-for-widget
Bug-Fix Reach Result After Operation Failed For Widget
2024-07-05 09:58:13 +02:00
Alper Öztürk
4d65f505f1
Merge pull request #13218 from nextcloud/make-cancel-all-uploads-more-efficient
Make upload handling more efficient
2024-07-05 09:22:29 +02:00
Nextcloud bot
6891072d28
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-05 02:39:50 +00:00
Tobias Kaminsky
c5183a60a8 daily dev 20240705
Update Nextcloud Android library
2024-07-05 03:48:16 +02:00
Tobias Kaminsky
5c86b142d8 Merge remote-tracking branch 'origin/master' into dev 2024-07-05 03:37:20 +02:00
Jonas Mayer
8e550a8436 rate limit retryFailedUploads and fix cancelled uploads bug
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-04 23:55:08 +02:00
Jonas Mayer
d0b56656bc make cancel all uploads more efficient
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-04 22:31:55 +02:00
Alper Öztürk
060c78a6f6
Merge pull request #13226 from nextcloud/convert-ConflictsResolveDialog-to-kt
Convert Conflicts Resolve Dialog to Kotlin
2024-07-04 21:47:43 +02:00
Alper Öztürk
32ad133d4a
Merge pull request #13227 from nextcloud/convert-remove-files-dialog-to-kt
Convert Remove Files Dialog to Kotlin
2024-07-04 21:47:22 +02:00
alperozturk
96753abfad
Fix
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 15:57:09 +02:00
alperozturk
4a1eecf8fd
Add copyright
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 15:23:47 +02:00
alperozturk
92bb3b95a5
Convert to Kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 15:22:07 +02:00
alperozturk
7fb67a839d
Rename .java to .kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 15:22:06 +02:00
alperozturk
3027b4fd35
Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 14:16:28 +02:00
alperozturk
62931a7d06
Convert Remove Files Dialog to Kotlin
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 14:09:31 +02:00
alperozturk
df1673b44c
Rename .java to .kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 14:09:30 +02:00
alperozturk
51887fe917
Convert to kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 11:37:37 +02:00
alperozturk
97d3064a66
Convert to kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 11:32:22 +02:00
alperozturk
4b95a811a9
Rename .java to .kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-04 11:32:21 +02:00
renovate[bot]
753e6bfda2 fix(deps): update dependency androidx.test:runner to v1.6.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-04 11:07:43 +02:00
Andy Scherzinger
4b47734054
Merge pull request #13202 from nextcloud/renovate/androidx.test-orchestrator-1.x
Update dependency androidx.test:orchestrator to v1.5.0
2024-07-04 10:44:24 +02:00
Andy Scherzinger
a5bdc80d5e
Merge pull request #13205 from nextcloud/renovate/com.vanniktech-emoji-google-0.x
Update dependency com.vanniktech:emoji-google to v0.21.0
2024-07-04 10:44:01 +02:00
Andy Scherzinger
847295ed02
Merge pull request #13204 from nextcloud/renovate/com.google.code.gson-gson-2.x
Update dependency com.google.code.gson:gson to v2.11.0
2024-07-04 10:43:18 +02:00
Alper Öztürk
2ba9fbaa79
Merge pull request #13201 from nextcloud/renovate/androidx.test.ext-junit-1.x
Update dependency androidx.test.ext:junit to v1.2.1
2024-07-04 10:02:09 +02:00
renovate[bot]
d91d00ee88 fix(deps): update dependency com.vanniktech:emoji-google to v0.21.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-04 09:46:05 +02:00
Alper Öztürk
6bed2ffdec
Merge pull request #13160 from nextcloud/make-upload-restart-more-efficient
Remove unnecessary checks and calls from restartFailedUploads
2024-07-04 08:46:47 +02:00
Nextcloud bot
f07ebd7eeb
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-04 02:43:03 +00:00
Tobias Kaminsky
4ef1af1883 daily dev 20240704 2024-07-04 02:38:16 +02:00
ZetaTom
3657923b4f
Improve naming and formatting
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
2024-07-03 12:20:23 +02:00
Jonas Mayer
cfd7340518
fix spotless
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-03 12:20:23 +02:00
Jonas Mayer
aca3ab8c66
make worker only try to upload current uploads
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-03 12:20:23 +02:00
Jonas Mayer
48d40b86af
fix logic issue when checking if delayed for charging
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-03 12:20:23 +02:00
Jonas Mayer
c84e3a9220
remove unnecessary checks and calls from restartFailedUploads
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-03 12:20:22 +02:00
Tobias Kaminsky
a22d296d8d daily dev 20240703 2024-07-03 03:37:50 +02:00
Tobias Kaminsky
1fca8aafef Merge remote-tracking branch 'origin/master' into dev 2024-07-03 03:32:23 +02:00
Tobias Kaminsky
c5d4e13589
Merge pull request #13219 from nextcloud/bugfix/create-plain-client-on-background-thread
Bug-Fix Create PlainClient On Background Thread
2024-07-02 13:56:30 +02:00
alperozturk
a9dc5af025
Show cancel layout
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-02 13:45:24 +02:00
Andy Scherzinger
5c24ba79bd
Merge pull request #13195 from nextcloud/convert-alert-dialogs-to-m3
Convert Alert Dialogs to M3
2024-07-02 10:13:40 +02:00
alperozturk
58ef190fec
Fix
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-02 10:08:46 +02:00
Nextcloud bot
31c7c8642f
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-02 02:43:02 +00:00
Tobias Kaminsky
a96ac1905b daily dev 20240702
Update Nextcloud Android library
2024-07-02 03:58:01 +02:00
Tobias Kaminsky
a36b5367d2 Merge remote-tracking branch 'origin/master' into dev 2024-07-02 03:49:40 +02:00
alperozturk
cdc2c26adf
Use M3
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 16:34:38 +02:00
alperozturk
b20cb89ebd
Use M3 for showAutoUploadAlertDialog
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 15:16:40 +02:00
alperozturk
0ee6492197 Use M3 for SettingsActivity
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 15:08:26 +02:00
alperozturk
0ca310b3e1 Reduce lint
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 15:08:26 +02:00
alperozturk
7a177b79c2 Fixes
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 15:08:26 +02:00
alperozturk
6bc5c4e945 Use view theme utils
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 15:08:26 +02:00
alperozturk
3429e43b84 Use M3 alert dialog
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 15:08:26 +02:00
alperozturk
28eac70a07 Optimize imports
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 15:08:26 +02:00
alperozturk
992977d27e Convert to M3
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 15:08:26 +02:00
alperozturk
ef99bf5332
Add raw byte
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 09:34:09 +02:00
alperozturk
fb3000e758 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 09:16:07 +02:00
alperozturk
d1d8c58c76 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 09:16:07 +02:00
alperozturk
a8d96d0319 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 09:16:07 +02:00
alperozturk
51724b5a89 Use bytesToHumanReadable
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 09:16:07 +02:00
alperozturk
8e07b47156 Use extension for null files
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 09:16:07 +02:00
alperozturk
3bc37e7097 Use extension for null files
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 09:16:07 +02:00
alperozturk
05cde13428 Use extension for null files
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 09:16:07 +02:00
alperozturk
9aee148f8a Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-01 09:16:07 +02:00
Nextcloud bot
8e4a146be6
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-01 02:39:09 +00:00
Nextcloud bot
93a465dbcb
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-06-30 02:39:44 +00:00
Tobias Kaminsky
7450695881 daily dev 20240630
Update Nextcloud Android library
2024-06-30 02:38:56 +02:00