Commit graph

2896 commits

Author SHA1 Message Date
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
alperozturk
7f70b1c0ea
Solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2023-12-07 15:04:10 +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
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
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
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
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
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
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
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