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 |
|
alperozturk
|
235d7418cd
|
Simplify code complexity
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:28:10 +01:00 |
|
alperozturk
|
81cb6933be
|
Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:28:06 +01:00 |
|
alperozturk
|
17657f3f50
|
Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:24:22 +01:00 |
|
alperozturk
|
d0de68b470
|
Merge remote-tracking branch 'origin/feature/files-action-in-search-mode' into feature/files-action-in-search-mode
# Conflicts:
# app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2023-12-07 10:24:03 +01:00 |
|
alperozturk
|
e018a65d0f
|
Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:23:00 +01:00 |
|
alperozturk
|
16a6a9bbbf
|
Fix needlessly boxes a boolean constant
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
60401b1596
|
Add move task back option
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
180b27c120
|
Optimize imports
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
5b4db1ba5f
|
Clear search view
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
af7d8985e2
|
Reuse content description for more button
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
7c0363496f
|
Reuse same functions, cleanup code
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
eeb91ab6da
|
Add files action to search
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:28 +01:00 |
|
alperozturk
|
3ee19ac189
|
Merge master (cant rebase due to multiple git conflicts)
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 09:55:12 +01:00 |
|
Alper Öztürk
|
67e9ee41cd
|
Merge pull request #12218 from nextcloud/bugfix/app-crash-when-file-is-renamed-via-details-view
Fix Crash / Rename File From File Details
|
2023-12-07 09:50:16 +01:00 |
|
alperozturk
|
0028d8ecbd
|
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 09:10:50 +01:00 |
|
Nextcloud bot
|
c5eaf11dff
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2023-12-07 02:35:44 +00:00 |
|