Commit graph

23661 commits

Author SHA1 Message Date
Jonas Mayer
b724f75bcb Merge branch 'master' into improve-retry-failed-uploads-function
# Conflicts:
#	app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
2024-04-22 17:26:40 +02:00
Jonas Mayer
77a1eade9b Simplify function and remove nested loop
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-04-18 13:53:30 +02:00
Jonas Mayer
57e11f858d Make retry filed uploads not restart worker for every file
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-04-18 12:50:22 +02:00
Andy Scherzinger
c1713fd6fb
Merge pull request #12895 from nextcloud/renovate/androidx.compose.ui-ui-tooling-preview-1.x
fix(deps): update dependency androidx.compose.ui:ui-tooling-preview to v1.6.6
2024-04-18 12:16:14 +02:00
Andy Scherzinger
bbb2e17527
Merge pull request #12896 from nextcloud/renovate/androidx.compose-compose-bom-2024.x
fix(deps): update dependency androidx.compose:compose-bom to v2024.04.01
2024-04-18 12:16:00 +02:00
Andy Scherzinger
acd251bebb
Merge pull request #12897 from nextcloud/renovate/composeoptions-1.x
fix(deps): update dependency composeoptions to v1.5.12
2024-04-18 12:12:56 +02:00
Andy Scherzinger
d85819a22a
Merge pull request #12899 from nextcloud/rakekniven-patch-1
fix(i18n): Improved grammar
2024-04-18 10:12:46 +02:00
rakekniven
865ce87571
fix(i18n): Improved grammar
Reported at Transifex

Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
2024-04-18 09:23:23 +02:00
Nextcloud bot
3d491b3fcd
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-18 02:42:51 +00:00
renovate[bot]
99814d53fd
Update dependency composeOptions to v1.5.12
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-17 19:27:59 +00:00
Andy Scherzinger
db589e0cdd
Merge pull request #12894 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2024-04-17 21:27:47 +02:00
renovate[bot]
4128c38633
Update dependency androidx.compose:compose-bom to v2024.04.01
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-17 19:25:59 +00:00
renovate[bot]
e3c05e5314
Update dependency androidx.compose.ui:ui-tooling-preview to v1.6.6
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-17 19:23:05 +00:00
nextcloud-android-bot
b22c037ab2 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2024-04-17 19:20:21 +00:00
Tobias Kaminsky
a104418d50
Merge pull request #12889 from nextcloud/bump3.30master
Bump master to 3.30 alpha
2024-04-17 12:14:29 +02:00
Nextcloud bot
eda6fdaa04
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-17 10:14:16 +00:00
tobiasKaminsky
260b4ac08f
Bump master to 3.30 alpha
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-04-17 12:14:00 +02:00
Tobias Kaminsky
a8040e46f6
Merge pull request #12854 from nextcloud/bugfix/e2e-file-conflict
Bugfix e2e file conflict
2024-04-17 12:03:24 +02:00
Tobias Kaminsky
34f0197e87
Merge pull request #12887 from nextcloud/bumpOutdatedVersion
outdated version is now NC26
2024-04-17 12:01:45 +02:00
tobiasKaminsky
6c7a9211e5
outdated version is now NC26
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-04-17 12:00:45 +02:00
tobiasKaminsky
c2530c8cfc
suppress spotbugs
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-04-17 10:42:22 +02:00
Andy Scherzinger
f3808c985a
Merge pull request #12886 from nextcloud/renovate/ubuntu-jammy
Update ubuntu:jammy Docker digest to 1b8d8ff
2024-04-17 10:30:50 +02:00
Tobias Kaminsky
0c2ae0a86f
Merge pull request #12828 from nextcloud/bugfix/handle-temp-encrypted-file
Bugfix Handle Temp Encrypted File Correctly
2024-04-17 10:17:08 +02:00
tobiasKaminsky
58ec17a63f
suppress spotbugs
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-04-17 10:10:33 +02:00
Tobias Kaminsky
f050c340af
Merge pull request #12880 from nextcloud/bugfix/assistant-ui-ux
Assistant Feature UI/UX Fixes
2024-04-17 09:33:11 +02:00
renovate[bot]
8d73fd7401
Update ubuntu:jammy Docker digest to 1b8d8ff
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-17 07:16:27 +00:00
alperozturk
0609caadb3 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
330d0ac837 ADD TODO
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
1e88d0df16 Fix drawer close
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
c5808fafe8 Add completion time
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
7df114dda0 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
a3785336d8 Add task detail screen
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
ca51c206b3 Remove unused xml
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
d3f3d3461b Remove unused codes
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
3d03ea09b0 Fix filterAssistantMenuItem
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
7e97a02c44 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
05b141ef64 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
6d219c5b8c Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
1e3e3ae86a Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
035ae37cd3 Use scrollable text view instead chunks
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
ac863b3778 Use scrollable text view instead chunks
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
8e82b5e16c Use chunks for bigger task output
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
ac1f066e24 Use all files as default menuItem
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
0200e51eb7 Toggle drawer from Assistant screen via menu button
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
alperozturk
afeb87ff78 Remove assistant from navbar if banner is visible
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-17 08:09:58 +02:00
Tobias Kaminsky
df0bab3c17
Merge pull request #12856 from nextcloud/faster-auto-upload
Optimize and fix some bugs for autoupload
2024-04-17 07:41:05 +02:00
Jonas Mayer
fef1458a06 fix unit test
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-04-16 16:24:15 +02:00
Jonas Mayer
684e842f08 rename some vars
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-04-16 15:38:27 +02:00
Jonas Mayer
7312db1068 Update app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Jonas Mayer <43114340+JonasMayerDev@users.noreply.github.com>
2024-04-16 15:38:27 +02:00
Jonas Mayer
be7d997dc3 Update app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Jonas Mayer <43114340+JonasMayerDev@users.noreply.github.com>
2024-04-16 15:38:27 +02:00