Commit graph

22543 commits

Author SHA1 Message Date
Andy Scherzinger
ffd89e56a3
Merge pull request #12268 from nextcloud/dependabot/github_actions/reactivecircus/android-emulator-runner-2.29.0
Bump reactivecircus/android-emulator-runner from 2.28.0 to 2.29.0
2023-12-11 13:29:02 +01:00
Andy Scherzinger
0d3ddbcbb4
add exact version number
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-12-11 13:25:08 +01:00
dependabot[bot]
10fa54380e
Bump reactivecircus/android-emulator-runner from 2.28.0 to 2.29.0
Bumps [reactivecircus/android-emulator-runner](https://github.com/reactivecircus/android-emulator-runner) from 2.28.0 to 2.29.0.
- [Release notes](https://github.com/reactivecircus/android-emulator-runner/releases)
- [Changelog](https://github.com/ReactiveCircus/android-emulator-runner/blob/main/CHANGELOG.md)
- [Commits](d94c3fbe4f...99a4aac18b)

---
updated-dependencies:
- dependency-name: reactivecircus/android-emulator-runner
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-11 11:47:50 +00:00
alperozturk
8a535caf4b
Solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-11 12:32:50 +01:00
alperozturk
ca4b4211e1
Solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-11 11:59:57 +01:00
alperozturk
50e45380b7
Solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-11 11:37:52 +01:00
Alper Öztürk
63ec726dbc
Merge pull request #12246 from nextcloud/10571-allow-to-dismiss-all-grouped-upload-failed-notifications
Fix: To many old notifications
2023-12-11 10:36:48 +01:00
Tobias Kaminsky
0e27b344bb
Merge pull request #12093 from nextcloud/bugfix/Despite-connection-is-restored-message-about-unreachable-server-still-present-9652182
Bugfix Check Network Connection When File Item Clicked
2023-12-11 08:12:55 +01:00
Nextcloud bot
acc766d035
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-11 02:40:25 +00:00
Nextcloud bot
8dd24c9c01
Fix(l10n): Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-11 02:39:56 +00:00
Nextcloud bot
e29bf49320
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-10 02:33:54 +00:00
Nextcloud bot
888f604d21
Fix(l10n): Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-10 02:33:24 +00:00
Nextcloud bot
5703c66e19
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-09 02:39:45 +00:00
Nextcloud bot
47717311fe
Fix(l10n): Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-09 02:39:14 +00:00
Tobias Kaminsky
fa07aad858
Merge pull request #12139 from nextcloud/feature/live-photo
Live Photo
2023-12-08 14:17:54 +01:00
alperozturk
633f45863b
Fix tests
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-08 12:41:10 +01:00
alperozturk
7719b2eb76
Use file id for merging live photos
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-08 12:35:51 +01:00
alperozturk
b48c027fca
Use file id for merging live photos
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-08 11:47:43 +01:00
Andy Scherzinger
0df687cb1d
Merge pull request #12255 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2023-12-08 11:01:34 +01:00
nextcloud-android-bot
f4322957ed 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2023-12-08 08:54:28 +00:00
tobiasKaminsky
d76d16f3a9
only cancel notification if an old file exists
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-12-08 09:41:15 +01:00
Jonas Mayer
5326d08aeb
hopefully really fix dodgy code
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-08 09:41:15 +01:00
Jonas Mayer
322565f099
fix dodgy code
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-08 09:41:14 +01:00
Jonas Mayer
713a464478
fix spotlessCheck for Kotlin
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-08 09:41:14 +01:00
Jonas Mayer
816305195a
rebase with new master
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-08 09:41:14 +01:00
Jonas Mayer
3a874412ea
remove Notification when upload is removed in UploadListActivity
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-08 09:41:14 +01:00
Jonas Mayer
c8b3f6fd3c
make failed notification go away when uploading makes progress
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-08 09:41:12 +01:00
alperozturk
60ec295fee
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-08 09:21:35 +01:00
Alper Öztürk
73ef692040
Merge pull request #12247 from nextcloud/10954-upload-progress-not-shown-in-uploads-screen-with-new-uploader
Implement other interface functions regarding file upload for upload worker
2023-12-08 09:18:08 +01:00
Nextcloud bot
13c6766669
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-08 02:35:27 +00:00
Nextcloud bot
3beca30432
Fix(l10n): Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-08 02:34:59 +00:00
Jonas Mayer
c698a2191a Fix spotbugs
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-07 17:14:06 +01:00
Jonas Mayer
ad34893419 isUploadingNow for uploads after file conflict resolved
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-07 16:56:41 +01:00
github-actions
6f1b62fa27 Analysis: update lint results to reflect reduced error/warning count
Signed-off-by: github-actions <github-actions@github.com>
2023-12-07 14:17:21 +00:00
Jonas Mayer
1d2a7c9d53 fix kotlin spotlessCheck
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-07 15:04:42 +01:00
Jonas Mayer
8e141506ec implement isUploading for Upload Worker
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-07 15:04:42 +01:00
Jonas Mayer
f65601f69f update other binder functions for use with file upload worker -> working progress bar
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-07 15:04:42 +01:00
Jonas Mayer
4f08a4737b add onTransferProgress for FilesUploadWorker
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2023-12-07 15:04:42 +01:00
alperozturk
7f70b1c0ea
Solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 15:04:10 +01:00
Alper Öztürk
3b3bf800f7
Merge pull request #12238 from nextcloud/refactor/use-service-compat
Use ServiceCompat For Foreground Service
2023-12-07 14:41:43 +01:00
alperozturk
6b3eb3e897
Simplify code
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 14:30:06 +01:00
alperozturk
534f9c143a
Add action for file conflict
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 14:14:11 +01:00
alperozturk
bbf06364a2
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 14:04:01 +01:00
alperozturk
8f9056562e
Simplify code
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 13:53:35 +01:00
alperozturk
96cb61b661
Add re-upload functionality
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 12:16:22 +01:00
alperozturk
5cc6d2e729
Merge remote-tracking branch 'origin/refactor/use-service-compat' into refactor/use-service-compat 2023-12-07 10:28:25 +01:00
alperozturk
8ebdecf399
Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 10:28:20 +01:00
alperozturk
9202f62f4c
Reset license header
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 10:28:11 +01:00
github-actions
9f8f5edfeb
Analysis: update lint results to reflect reduced error/warning count
Signed-off-by: github-actions <github-actions@github.com>
2023-12-07 10:28:11 +01:00
alperozturk
262be95387
Rename function
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 10:28:10 +01:00