Commit graph

4758 commits

Author SHA1 Message Date
Tobias Kaminsky
c31b3297a0 Merge remote-tracking branch 'origin/master' into dev 2024-05-04 03:38:47 +02:00
alperozturk
f23b0bdf3e
Solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-03 13:29:59 +02:00
Nextcloud bot
956b6755a7
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-05-03 02:42:21 +00:00
Tobias Kaminsky
f6cae9f624 daily dev 20240503 2024-05-03 02:37:35 +02:00
Tobias Kaminsky
fa0b9d647c Merge remote-tracking branch 'origin/master' into dev 2024-05-03 02:31:09 +02:00
Alper Öztürk
148c869a9d
Merge pull request #12934 from nextcloud/refactor/encryptedUpload
Refactor Encrypted Upload
2024-05-02 18:54:32 +02:00
Jonas Mayer
aae144331c Fix log messages
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-05-02 16:18:50 +02:00
Jonas Mayer
98586faa77 Fix spotless
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-05-02 16:09:32 +02:00
Tobias Kaminsky
e21a023fca
Merge pull request #12941 from nextcloud/feature/inform-user-for-uploading-same-file-again
Inform user for uploading same file again
2024-05-02 16:08:03 +02:00
Jonas Mayer
9cbdbead08 Fix codacy
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-05-02 16:00:13 +02:00
Jonas Mayer
d18235ffb4 Merge branch 'master' into make_sync_service_run_only_once
# Conflicts:
#	app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt
2024-05-02 15:48:00 +02:00
Jonas Mayer
a73b3e9e72 Skip folder scan if charging only and not charging
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-05-02 15:42:12 +02:00
Alper Öztürk
56d9327bbb
Merge pull request #12942 from nextcloud/bugfix/delete-file-v1
Bugfix E2E File Deletion For V1
2024-05-02 15:42:02 +02:00
Tobias Kaminsky
30b5a4ca89
Merge pull request #12930 from nextcloud/bugfix/limitToPersonalFiles-fix-null-string-equals-exception
Fix NullPointerException when invoking equals() on limitToPersonalFiles
2024-05-02 15:33:28 +02:00
Jonas Mayer
68629ea603 get rid of repeated codes in WorkManagerExtensions
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-05-02 15:25:22 +02:00
Alper Öztürk
becdbd6fbe
Merge pull request #12911 from nextcloud/improve-retry-failed-uploads-function
Improve retry failed uploads function
2024-05-02 15:17:01 +02:00
alperozturk
57b295c13f Remove deleted files from metadata
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 13:57:59 +02:00
alperozturk
981d3dd3ec Fix broken file names
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 13:57:59 +02:00
alperozturk
0deca4cb26 Simplify
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 13:57:59 +02:00
alperozturk
a690674b5d Convert to kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 13:57:59 +02:00
alperozturk
2b257fb67e Convert to kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 13:57:59 +02:00
alperozturk
d7b30bad46 Convert to kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 13:57:59 +02:00
alperozturk
1ccb686f08 Rename .java to .kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 13:57:59 +02:00
alperozturk
a153c5ce52 Add delete v1 method
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 13:57:59 +02:00
Alper Öztürk
361f9ddbb2
Merge pull request #12952 from nextcloud/bugfix/media-control-view-visibility
Fix Media Control View Visibility
2024-05-02 13:52:32 +02:00
alperozturk
d180ad62c7
Fix header
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 10:43:56 +02:00
alperozturk
987f8bb82a
Fix header
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 10:42:37 +02:00
alperozturk
51af8bb118
Fix license header
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 09:13:11 +02:00
alperozturk
e36a3b1807
Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 09:08:15 +02:00
alperozturk
115d033fbf Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:56:48 +02:00
alperozturk
0c1e2bcc1d Fix NullPointerException when invoking equals() on null String reference
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:56:48 +02:00
alperozturk
82af5b4787 Rename functions
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
bb36e3211e Fix kotlin spotless
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
25a65473d4 Check nullable fields
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
34aa3b6cc7 Check nullable fields
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
21968c1411 Use region
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
323fa0827b extract performE2EUpload
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
7f8810e66f Filelock usage
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
0ab2e1e34d Add initFileChannel
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
8725fa068b Initialize E2EClientData earlier
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
db2a84b5fe Use different data classes
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
90dc1c6535 Use different data classes
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
a949bd515d Extract logics to functions
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
2d8d0d9b5f Extract logics to functions
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
b3357c0b07 Extract logics to functions
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:57 +02:00
alperozturk
a53d661d73 Inform user for uploading same file again
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:55:46 +02:00
alperozturk
4564ea0483
fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:51:20 +02:00
alperozturk
0a88cf9a7e
solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:51:20 +02:00
alperozturk
599c554e91
fix git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:51:20 +02:00
alperozturk
03d6251976
Fix visibility of media control view
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-05-02 08:51:19 +02:00