Commit graph

5277 commits

Author SHA1 Message Date
Tobias Kaminsky
4a6daa9af6 Merge remote-tracking branch 'origin/master' into dev 2024-07-17 03:40:11 +02:00
renovate[bot]
dc695704f6
fix(deps): update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v6.0.19
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-16 15:39:22 +00:00
Tobias Kaminsky
754c02a8ab daily dev 20240716
Update Nextcloud Android library
2024-07-16 08:58:04 +02:00
Tobias Kaminsky
fd125c11b9 Merge remote-tracking branch 'origin/master' into dev 2024-07-16 08:46:59 +02:00
renovate[bot]
c07705d7c4
Update dependency pl.droidsonroids.gif:android-gif-drawable to v1.2.29
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-15 16:59:49 +00:00
Nextcloud bot
714f8ad469
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-15 02:39:53 +00:00
Nextcloud bot
5c80c50ec3
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-14 02:41:32 +00:00
Tobias Kaminsky
26d60d7070 daily dev 20240714
Update Nextcloud Android library
2024-07-14 02:38:40 +02:00
Tobias Kaminsky
224fa94eeb Merge remote-tracking branch 'origin/master' into dev 2024-07-14 02:32:34 +02:00
Nextcloud bot
22ecfcf1a2
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-13 02:43:31 +00:00
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