Commit graph

3477 commits

Author SHA1 Message Date
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
Tobias Kaminsky
0cafdefeb4 daily dev 20231209
Update Nextcloud Android library
2023-12-09 03:41:11 +01: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
d28d57ebb9 Merge remote-tracking branch 'origin/master' into dev 2023-12-09 03:36:00 +01: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
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
Tobias Kaminsky
c6eedd8e2c daily dev 20231208
Update Nextcloud Android library
2023-12-08 03:41:58 +01:00
Tobias Kaminsky
b36caee4c7 Merge remote-tracking branch 'origin/master' into dev 2023-12-08 03:36:42 +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
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
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
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
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
Nextcloud bot
e9ea441b5f
Fix(l10n): Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-07 02:35:16 +00:00
Tobias Kaminsky
4b41f483be daily dev 20231207 2023-12-07 02:40:45 +01:00
Tobias Kaminsky
4ee92c635d Merge remote-tracking branch 'origin/master' into dev 2023-12-07 02:30:58 +01:00
Andy Scherzinger
2b166a81eb
Merge pull request #12226 from nextcloud/fix-options-menu
Fix: ImageActivity crash after options menu selected
2023-12-06 19:37:16 +01:00
alperozturk
2077bf96bc
Fix text color for live photo indicator
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 16:06:22 +01:00
alperozturk
b493c6793e
Fix crashes
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 15:53:45 +01:00
Andy Scherzinger
6acd893ee1
Merge pull request #12212 from nextcloud/fix/quota_exceeded_message_uploadlist
Use custom quota exceeded error message in UploadList
2023-12-06 15:46:23 +01:00
alperozturk
5adc69421c Reduce spotbugs
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 15:38:08 +01:00
alperozturk
0b351d2e0e Fix crash
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 15:38:08 +01:00
parneet-guraya
25d045f9a9 fix activity crash on options menu selected
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
2023-12-06 15:37:17 +01:00
Andy Scherzinger
79aceb8990
Merge pull request #11948 from nextcloud/hideSecureShare
if e2e server app is disabled, do not show secure file drop
2023-12-06 15:35:57 +01:00
alperozturk
2f1e3ea2b4
Fix merge conflict
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 15:27:48 +01:00
alperozturk
d14cc99885
Fix merge conflict
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 14:50:55 +01:00
alperozturk
21466b5217
Add fixme
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 14:47:33 +01:00
alperozturk
28d4220e67
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 14:37:33 +01:00
alperozturk
6854c93815
Reset license header
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 14:37:00 +01:00
alperozturk
1b403ab1c0
Add remove action
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 14:34:21 +01:00
alperozturk
f4ffe4fdae
Add actions
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 14:26:43 +01:00
Andy Scherzinger
ad820fcc08
Revert "Merge pull request #12228 from nextcloud/feature/better-feedback-for-failed-uploads"
This reverts commit f71d5a4aee, reversing
changes made to d3906c0f45.
2023-12-06 14:09:01 +01:00
alperozturk
5f99e4379d
Add Two Action Dialog button
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 14:02:09 +01:00
Alper Öztürk
8023b0fb49
Merge pull request #12234 from nextcloud/bugfix/fix-crash-DashboardWidgetService-IndexOutOfBoundsException
Fix Crash DashboardWidgetService
2023-12-06 13:09:06 +01:00
tobiasKaminsky
c02c3e530f if e2e server app is disabled, do not show secure file drop
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-12-06 12:48:27 +01:00
Andy Scherzinger
b98db41062
Merge pull request #12162 from nextcloud/bugfix/search-not-working-when-sharing-outside-of-the-app
Bugfix Search Not Working When Sharing File From Outside of the App
2023-12-06 12:48:09 +01:00
Andy Scherzinger
399408adef
Merge pull request #12207 from nextcloud/bugfix/Mp3-and-sometimes-.md-files-assume-folder-thumbnails-on-refresh
Bugfix Mp3-and-sometimes-.md-files-assume-folder-thumbnails-on-refresh'
2023-12-06 12:38:38 +01:00
Andy Scherzinger
6f4a0cccfc
Merge branch 'master' into bugfix/search-not-working-when-sharing-outside-of-the-app 2023-12-06 10:52:36 +01:00
alperozturk
34881cebbc
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 10:50:32 +01:00
alperozturk
647e0b74ab
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 10:47:50 +01:00
alperozturk
f24525f2c6 Set StableIds for OCFileList
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 10:24:47 +01:00
Andy Scherzinger
7b4ecf7dc5
check the right var for null
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-12-06 10:22:44 +01:00
ZetaTom
d6f77e2491
Use custom quota exceeded error message
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
2023-12-06 10:15:21 +01:00
tobiasKaminsky
a47ed56ad9
add test
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-12-06 10:10:40 +01:00
alperozturk
eb8cb8df99
Rename function
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 10:04:36 +01:00
alperozturk
b2e0e76605
Simplify code complexity
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 09:56:07 +01:00
alperozturk
39231af670
Use ServiceCompat, Simplify code complexity
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-06 09:48:09 +01:00
Andy Scherzinger
a7dcbf4f12 Use Compat implementation to launch service on sdk>=Q
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-12-06 08:28:19 +00:00
Andy Scherzinger
cff3495b20 remove unused button style
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-12-06 08:28:19 +00:00
Andy Scherzinger
cae221720a Only get sdk=30 fragmet if client is on sdk>=30
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-12-06 08:28:19 +00:00
Andy Scherzinger
6038dd892c Migrate BuildConfig to Gradle Build Files
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-12-06 08:28:19 +00:00
tobiasKaminsky
04bce452d6
fix tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-12-06 08:44:52 +01:00
Tobias Kaminsky
33db1c0f8e daily dev 20231206
Update Nextcloud Android library
2023-12-06 03:41:36 +01:00
Nextcloud bot
028c30808d
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-06 02:36:55 +00:00
Nextcloud bot
875dcf0f12
Fix(l10n): Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-12-06 02:36:27 +00:00
Tobias Kaminsky
3b00ea1877 Merge remote-tracking branch 'origin/master' into dev 2023-12-06 03:36:22 +01:00
alperozturk
59b82b28bb
Fix kotlin spotless check
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-05 14:04:34 +01:00
alperozturk
39ce4c4c1c
Change content intent
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-05 14:02:20 +01:00
alperozturk
982bda6347 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-05 10:57:09 +00:00
alperozturk
51f45f9518 Fix crash for empty list
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-05 10:57:09 +00:00
Alper Öztürk
646f0b4c45
Merge pull request #12184 from nextcloud/refactor/convert-events-to-kt
Convert Events to Kotlin
2023-12-05 11:35:29 +01:00
alperozturk
bc125fa06c
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-05 09:30:47 +01:00
alperozturk
8be0dbe1e7
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-05 09:29:31 +01:00
Alper Öztürk
548f770968
Merge pull request #12231 from nextcloud/handle-sync-cancel
Fix: Cancel Sync does not work
2023-12-05 08:58:48 +01:00
Tobias Kaminsky
a8ed04faa9 daily dev 20231205
Update Nextcloud Android library
Update 3rd-party dependencies
2023-12-05 03:41:52 +01:00