mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 08:24:08 +03:00
Code Issues Projects Releases Packages Wiki Activity
23388 commits 221 branches 1588 tags 639 MiB
Commit graph

3424 commits

Author SHA1 Message Date
alperozturk
f756a03147 Fix requestDownloads 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
875c509504 Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
4e4c3a6dd5 Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
3b5b4313eb Use BackgroundJobManager for cancel Downloads 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
e3d8e85337 Fix FileDownloaderBinder cancelAllDownloadsForAccount 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
efe6649b69 Fix FileDownloaderBinder functions 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
60ee1d59ad Fix Code Analytics 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
1c2c56fdd4 Fix sync 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
f14abd4b8e Remove return 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
9b124d402b Add TODO for some unknown code block 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
589f9561b2 Add TODO for some unknown code block 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
919fd6b850 Fix Notifications 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
d601998858 Fix createMockTask test 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
6bd335cf3c Move packages 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
414e6a668a Remove Download Service Connections 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
e123128d90 Solve git conflicts 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
e1238e3bd1 Create user from accountName 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
daa882aa20 Use interfaceSerializer 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
7588dc5430 Implement files download worker constructor 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
e2b75915e7 Create download worker 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
8308f187fa Solve git conflicts 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
cf09356cf7 Cleanup code 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
842ff87c84 Fix download progress 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
6fcc35f7de Code cleanup 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
fd3408b9ce Code cleanup 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
9f3e61cef3 Create user from accountName 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
2b595910b4 Use interfaceSerializer 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
8610275362 Remove handler 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
f0a845fc3a Overload downloadFile functions 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
828c239a97 Overload downloadFile functions 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
c419604ae5 Remove FileDownloader Service 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
fe11d64fb3 Refactor FilesDownloadWorker 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
2a00392ff5 Implement FilesDownloadWorker 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
a2afffc667 Implement FilesDownloadWorker 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
f4802b9519 Implement FilesDownloadHelper 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
1b8e25b77b Solve git conflicts 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
alperozturk
e392ad3f75 Create download worker 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2024-01-12 08:51:16 +01:00
Nextcloud bot
61493ee3bd
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-01-12 02:36:05 +00:00
Nextcloud bot
0e975c6b3b
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-01-12 02:35:36 +00:00
Tobias Kaminsky
880ad62cf5 Merge remote-tracking branch 'origin/master' into dev 2024-01-12 02:31:15 +01:00
Jonas Mayer
1043070d5f suppress warning 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-11 13:33:24 +01:00
Jonas Mayer
9c7890d797 Make sure notifyDataSetChanged gets directly called after removing file 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-11 12:16:41 +01:00
Alper Öztürk
5ec3f5115a
Merge pull request #12345 from nextcloud/make_sure_upload_is_only_added_once_to_db 
Make sure upload is only added once to db
 2024-01-11 09:19:23 +01:00
Alper Öztürk
1757edecad
Merge pull request #12337 from nextcloud/11741-auto-upload-does-not-start-automatically-on-3250 
Fix auto upload does not start automatically
 2024-01-11 09:10:42 +01:00
Nextcloud bot
b7d52861fd
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-01-11 02:36:41 +00:00
Nextcloud bot
1d079a93da
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-01-11 02:36:15 +00:00
Tobias Kaminsky
2015f7327a Merge remote-tracking branch 'origin/master' into dev 2024-01-11 02:31:09 +01:00
Jonas Mayer
3d3cd15094 Remove forgotten test function call 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-10 09:53:41 +01:00
Jonas Mayer
efe3b55208 Make uploads in tests unique 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-10 09:53:41 +01:00
Jonas Mayer
8995fe727e Make code cleaner with linebreak 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-10 09:53:41 +01:00
Jonas Mayer
55a689a7c9 reformat code 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-10 09:53:41 +01:00
Jonas Mayer
872f36b9a0 remove time test 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-10 09:53:41 +01:00
Jonas Mayer
8d6dc25f86 check if upload already exists in db 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-10 09:53:41 +01:00
Alper Öztürk
fb3694fc04
Merge pull request #12310 from nextcloud/handle-audio-focus 
handle audio focus and becoming noisy
 2024-01-10 09:51:31 +01:00
Nextcloud bot
e625f45db3
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-01-10 02:40:08 +00:00
Nextcloud bot
90bd32a7fc
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-01-10 02:39:41 +00:00
Tobias Kaminsky
e86bac18ca Merge remote-tracking branch 'origin/master' into dev 2024-01-10 03:35:06 +01:00
parneet-guraya
fb6faa2977
handle audio focus and becoming noisy 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2024-01-10 02:40:17 +05:30
Jonas Mayer
b6876b0607 Allow null for loadUrl 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-09 11:05:27 +01:00
Nextcloud bot
eccf6c5a7e
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-01-09 02:40:59 +00:00
Nextcloud bot
cb984d3cea
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-01-09 02:40:32 +00:00
Tobias Kaminsky
c0aa6295bb Merge remote-tracking branch 'origin/master' into dev 2024-01-09 02:31:10 +01:00
Jonas Mayer
6c834f47fc reformat code 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-08 11:00:49 +01:00
Jonas Mayer
692f8407dc Add ForegroundServiceType if android version allows 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-08 11:00:49 +01:00
Jonas Mayer
2fd8bf3f0c Fix spotless 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-08 11:00:49 +01:00
Jonas Mayer
33dd900882 Make getFileChecksum a lot faster 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-08 11:00:49 +01:00
Jonas Mayer
07ffe3f46d Add foreground feedback notification for sync process 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2024-01-08 11:00:49 +01:00
Nextcloud bot
82d3029b65
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-01-08 07:21:27 +00:00
tobiasKaminsky
62bfd58c04
Transifex fails on renaming strings 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2024-01-08 07:11:57 +01:00
Tobias Kaminsky
286bd37174 Merge remote-tracking branch 'origin/master' into dev 2023-12-30 02:31:11 +01:00
Alper Öztürk
76369d4880
Merge pull request #11936 from nextcloud/migrate-to-media3 
Migrate to media3 and Immersive mode for video playback
 2023-12-29 09:01:05 +01:00
Tobias Kaminsky
a0e5083d3b Merge remote-tracking branch 'origin/master' into dev 2023-12-29 02:31:19 +01:00
alperozturk
17dc3c82a9
Fix button alignment 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-28 13:00:54 +01:00
alperozturk
8d845c8d0f
Code cleanup 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-28 12:55:29 +01:00
alperozturk
1d92784f96
Use binding 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-28 11:46:53 +01:00
alperozturk
9a746c2521
Code cleanup 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-28 11:38:45 +01:00
parneet-guraya
621f0fd0c6
refactoring 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-27 18:49:15 +05:30
parneet-guraya
1b797af6b3
use scoping function 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:56:04 +05:30
parneet-guraya
e73e3e4b8c
fix lint 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:38:01 +05:30
parneet-guraya
8177b3a143
remove next & previous buttons 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:38:00 +05:30
parneet-guraya
80d52f5ef6
remove dependency on internal player layout 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:38:00 +05:30
parneet-guraya
40bb49c69f
refactor media handling logic 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:38:00 +05:30
parneet-guraya
8e843ed046
migrate to activity 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:59 +05:30
parneet-guraya
903fc44edb
fix lint @OptIn lint error 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:59 +05:30
parneet-guraya
7143104b6f
set black background for video playback 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:59 +05:30
parneet-guraya
9bafd66f9b
add name to substantially changed files in license header 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:58 +05:30
parneet-guraya
c84a1da6fa
fix warning 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:58 +05:30
parneet-guraya
9f7138b150
remove deprecated fullscreen listener 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:57 +05:30
parneet-guraya
f7b1e0f279
remove method which add margin to the touch area 
which used to  make the user open drawer
from the left
(drawer is no longer available from the fragment so it's unusable).

Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:57 +05:30
parneet-guraya
d38d31e7b0
remove old code 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:57 +05:30
parneet-guraya
01d5ff244a
add immersive mode/fullscreen functionality for video playback 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:56 +05:30
parneet-guraya
89459865bc
set display cutout mode to never 
so to never render content in cutout area,
it is considered best practice for immersive mode,
(used in PreviewMediaFragment for vidoe files).

Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:56 +05:30
parneet-guraya
b65ef92a19
set fitsSystemWindows attribute false. 
It avoid making padding behind the system bars.

Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:56 +05:30
parneet-guraya
67465459c7
remove going fullscreen using dialog 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:55 +05:30
parneet-guraya
33e3053edc
run migration script 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-26 15:37:55 +05:30
Tobias Kaminsky
f68ef163ad Merge remote-tracking branch 'origin/master' into dev 2023-12-23 03:36:32 +01:00
Nextcloud bot
a59463f820
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-22 02:41:42 +00:00
Tobias Kaminsky
05d37164ff Merge remote-tracking branch 'origin/master' into dev 2023-12-22 03:36:07 +01:00
Alper Öztürk
5fb9115997
Merge pull request #12303 from nextcloud/refactor/use-work-manager-for-upload 
Use Only Work Manager For File Upload
 2023-12-21 19:14:24 +01:00
Jonas Mayer
cd3bdde09b show info toast only when needed 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2023-12-21 17:13:58 +01:00
Jonas Mayer
8235153c34 remove unnecessary log message 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2023-12-21 17:13:58 +01:00
parneet-guraya
0001f492b5
handle restoring fab icon from drawer view 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-21 18:43:08 +05:30
alperozturk
f1bd5f1b90 Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-21 14:01:01 +01:00
alperozturk
1c569fbd73 Create download worker 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-21 14:01:01 +01:00
alperozturk
c0e694537d Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-21 14:01:01 +01:00
alperozturk
c43583d4d3 Create download worker 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-21 14:01:01 +01:00
alperozturk
e7190b522e Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-21 14:01:01 +01:00
alperozturk
535446192f Create download worker 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-21 14:01:01 +01:00
alperozturk
f6e1b57b2a Reduce spotbugs 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-21 14:01:01 +01:00
alperozturk
2ac0267bd9 Fix code analytics 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-21 14:01:01 +01:00
alperozturk
1108df7104 Use only work manager 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-21 14:01:01 +01:00
Jonas Mayer
e51cdf6658 fix spotless error 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2023-12-21 13:18:14 +01:00
Jonas Mayer
979a13cbb6 Fix failing tests, fix typo 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2023-12-21 13:18:14 +01:00
Jonas Mayer
bbecd6e2bc Fix unused resource 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2023-12-21 13:18:14 +01:00
Jonas Mayer
885aa703e8 Fix spotless issues 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2023-12-21 13:18:14 +01:00
Jonas Mayer
5cc6322725 Add logic for logging start and end of important workers 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2023-12-21 13:18:14 +01:00
Jonas Mayer
3f79f149c8 Add space for background worker execution info in ETM Activity 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
 2023-12-21 13:18:14 +01:00
Tobias Kaminsky
11fc9875d7 Merge remote-tracking branch 'origin/master' into dev 2023-12-21 02:31:07 +01:00
alperozturk
d3ab706086
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 16:39:48 +01:00
alperozturk
2b05662a89
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 16:37:57 +01:00
alperozturk
5028f91f4c
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 16:32:08 +01:00
alperozturk
28121d982a
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 16:01:23 +01:00
alperozturk
d0ff183f77
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 16:01:02 +01:00
alperozturk
6b9f637259
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 16:00:20 +01:00
alperozturk
c8b04e659f
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:59:12 +01:00
alperozturk
e0cd421734
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:46:00 +01:00
alperozturk
897d205c2d
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:40:44 +01:00
alperozturk
55f5d9e884
Add checkbox top left corner 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:40:39 +01:00
alperozturk
d2118a8e72
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:40:38 +01:00
alperozturk
cbd6fa0e43
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:40:17 +01:00
alperozturk
8f0bfdec5d
Add filename for media files 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:40:12 +01:00
alperozturk
63ee2cc009
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:40:11 +01:00
alperozturk
d3de88addb
Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:40:03 +01:00
alperozturk
6e3de92ab2
Fix FileFeaturesLayout visibility 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:35:05 +01:00
alperozturk
7d0db80f4d
Fix FileFeaturesLayout visibility 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:23:14 +01:00
alperozturk
c4aca7c7ce
fix import 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:34 +01:00
alperozturk
8a5ef54e79
Fix share icon 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:34 +01:00
alperozturk
aa7bab0fae
Sync with master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:34 +01:00
alperozturk
e176059406
Change selectedItemBackgroundColorId for dark mode 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
76bfefb491
Add checkbox top left corner 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
ee520598b5
Hide more button when multi select enabled 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
27b0694671
Align grid item in center 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
118a62232d
Add filename for media files 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
fa8a055152
Rename, use resources 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
a45268f398
Simplify code 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:33 +01:00
alperozturk
836c0fd3b5
Add margin for grid layout 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:32 +01:00
alperozturk
1adc326d4b
Add corner radius to item layout 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:32 +01:00
alperozturk
6c1b29010e
Cleanup bind function 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:32 +01:00
alperozturk
447349cb40
Rebase fix 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-20 15:11:32 +01:00
ZetaTom
e6a677eede
Fix suggestion 
- see cb329b1e37
- suggestion missed one line

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
 2023-12-20 14:49:40 +01:00
Tobias Kaminsky
ea0557eda7 Merge remote-tracking branch 'origin/master' into dev 2023-12-20 03:36:28 +01:00
Nextcloud bot
54077fce38
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-20 02:34:23 +00:00
Nextcloud bot
15a721bfcb
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-20 02:33:56 +00:00
Tobias Kaminsky
f430bf18c5
Merge pull request #12287 from nextcloud/refactor/remove-deprecated-argument-passing 
Replace Deprecated Argument Passing
 2023-12-19 07:59:38 +01:00
Tobias Kaminsky
cad16bdf9a Merge remote-tracking branch 'origin/master' into dev 2023-12-19 03:36:12 +01:00
Nextcloud bot
b653711be2
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-19 02:35:36 +00:00
Nextcloud bot
d6685468eb
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-19 02:35:10 +00:00
Alper Öztürk
224c2e64ea Update app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java 
I tested. Looks like not needed.

Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:13 +00:00
Alper Öztürk
8c43463df0 Update app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:13 +00:00
Alper Öztürk
9874673f74 Update app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:13 +00:00
Alper Öztürk
cb329b1e37 Update app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
6718a36933 Update app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
61251b650e Update app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
5ff5d60db1 Update app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
ea013b0cb3 Update app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
Alper Öztürk
b980f552c8 Update app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-18 14:47:12 +00:00
alperozturk
e8ff0380f0 Optimize imports 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
4483ca16db Optimize imports 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
fae5f69154 Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
03114c1863 Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
5aeac16efd Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
da6477fd4d Optimize imports 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
e9e425d879 Optimize imports 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
b37f00e24d Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
1973a20710 Rebase master 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
32fd626f77 Fix merge conflicts 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
1b399b2b9c Fix merge conflicts 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
10c564dc86 Reduce dodgy code 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
ec3be74a37 Reduce dodgy codes 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
d01991e95d Replace deprecated usages 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
0ba2a6881a Replace deprecated usages 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
alperozturk
868da5bf7c Replace deprecated usages 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-18 14:47:12 +00:00
Unpublished
8a87948cf7 Use try-with-resources for Cursor in getUploadByRemotePath 
Signed-off-by: Unpublished <unpublished@users.noreply.github.com>
 2023-12-18 10:49:28 +01:00
Alper Öztürk
91a689aeb3
Merge pull request #12290 from nextcloud/bugfix/choose-remote-folder-in-auto-upload-has-wrong-buttons 
Bugfix Choose Remote Folder In Auto Upload Has Wrong Buttons
 2023-12-18 09:55:27 +01:00
Alper Öztürk
32bad4084b
Merge pull request #12298 from nextcloud/restore-fab 
restore fab icon when going back
 2023-12-18 09:07:41 +01:00
Nextcloud bot
b782d03fdd
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-18 02:35:26 +00:00
Nextcloud bot
082b77f4bc
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-18 02:34:57 +00:00
Nextcloud bot
1ff04319f7
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-17 02:35:00 +00:00
Nextcloud bot
8a50c0f074
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-17 02:34:33 +00:00
Nextcloud bot
0a111ad06c
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-16 02:35:16 +00:00
Nextcloud bot
4091b7ac57
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-16 02:34:50 +00:00
Tobias Kaminsky
62841cf0d3 Merge remote-tracking branch 'origin/master' into dev 2023-12-16 02:31:08 +01:00
parneet-guraya
9f1c90cce0
restore fab icon when going back 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-15 21:32:42 +05:30
alperozturk
2ae17d1a6b
Reduce lint 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-15 10:36:06 +01:00
alperozturk
0e956cc30b
Change acccess modifiers 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-15 10:36:06 +01:00
alperozturk
af3e88fb01
Add screenshot tests 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-15 10:36:06 +01:00
alperozturk
d3ab31ab70
Fix Button Alignment 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-15 10:36:06 +01:00
alperozturk
fd39d7c2d7
Add choose button for Folder Picker 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-15 10:36:06 +01:00
Andy Scherzinger
ddb15ce594
Merge pull request #12286 from nextcloud/rakekniven-patch-1 
fix(i18n): Fixed typo and changed grammar
 2023-12-15 09:39:44 +01:00
Nextcloud bot
1125fae4d3
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-15 02:34:41 +00:00
Tobias Kaminsky
ef86b65793 Merge remote-tracking branch 'origin/master' into dev 2023-12-15 03:34:15 +01:00
Nextcloud bot
f0b0254457
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-15 02:34:14 +00:00
rakekniven
4110683890 fix(i18n): Fixed typo and changed grammar 
Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
 2023-12-14 17:42:07 +01:00
alperozturk
e1e37fc421
Solve git conflicts 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-14 15:27:42 +01:00
Alper Öztürk
397ac21eda
Merge pull request #12209 from nextcloud/feature/files-action-in-search-mode 
Add Files Action to Search
 2023-12-14 15:18:31 +01:00
Alper Öztürk
7b63b1d777 Update app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java 
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-14 10:14:04 +00:00
alperozturk
ae5df18ea4 Reduce spotbugs 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-14 10:14:04 +00:00
alperozturk
82c74f0404 Reduce spotbugs 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-14 10:14:04 +00:00
alperozturk
ea40abba20 Use unique id for header as well 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-14 10:14:04 +00:00
alperozturk
90baee0f2c Fix flickering issue 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-14 10:14:04 +00:00
alperozturk
aa1658f8c9 Fix Two different ViewHolders have the same stable ID. Stable IDs in your adapter MUST BE unique and SHOULD NOT change. 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-14 10:14:04 +00:00
Tobias Kaminsky
f3e61fbaaa Merge remote-tracking branch 'origin/master' into dev 2023-12-14 03:34:58 +01:00
Nextcloud bot
13e317f9bd
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-14 02:34:19 +00:00
Nextcloud bot
f79de430d2
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-14 02:33:49 +00:00
alperozturk
157fee3b2a
Solve git conflicts 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-13 09:29:55 +01:00
Nextcloud bot
c361d5b040
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-13 02:36:48 +00:00
Nextcloud bot
7604c3167e
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-13 02:36:21 +00:00
Tobias Kaminsky
4d6d13175c Merge remote-tracking branch 'origin/master' into dev 2023-12-13 02:31:07 +01:00
parneet-guraya
fdf429c100
solve merge conflict 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-12 23:46:08 +05:30
parneet-guraya
40fce4cb87
suggested changes 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-12 23:46:08 +05:30
parneet-guraya
cfd8e41949
add docs 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-12 23:46:07 +05:30
parneet-guraya
9a8bab74c3
save currently showing sortGroup visibility 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-12 23:46:06 +05:30
parneet-guraya
5973c6be0d
save/restore stack object 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-12 23:46:05 +05:30
parneet-guraya
09b8f48bcf
add stack to hold sortGroup view visibility 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-12 23:46:04 +05:30
parneet-guraya
eddbc878c7
encapsulate showing list group view logic while launching the fragment 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-12 23:46:03 +05:30
parneet-guraya
57bd43b973
call same method to configure next view 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
 2023-12-12 23:45:59 +05:30
alperozturk
eadfb83f54
Fix tests 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-12 15:49:33 +01:00
Alper Öztürk
06f51e1ddd
Merge pull request #12251 from nextcloud/feature/better-feedback-for-failed-uploads 
Better Feedback For Failed Uploads
 2023-12-12 09:04:19 +01:00
Nextcloud bot
bf35c722eb
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-12 02:36:20 +00:00
Nextcloud bot
cc4c1ee745
Fix(l10n): Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-12-12 02:35:51 +00:00
Tobias Kaminsky
431f93b15f Merge remote-tracking branch 'origin/master' into dev 2023-12-12 02:31:12 +01:00
alperozturk
e8fb0f1dfc Fix code analytics 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-11 20:31:24 +01:00
alperozturk
15efff1804 Fix register broadcast 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-11 20:31:24 +01:00
Jonas Mayer
32dc5a9dc0
Update app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java 
Signed-off-by: Jonas Mayer <43114340+JonasMayerDev@users.noreply.github.com>
 2023-12-11 15:54:24 +01:00
Alper Öztürk
d1ea7fc5dd
Update app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java 
Co-authored-by: Jonas Mayer <43114340+JonasMayerDev@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-11 15:51:40 +01:00
Alper Öztürk
604cbe17d5
Update app/src/main/res/values/strings.xml 
Co-authored-by: Jonas Mayer <43114340+JonasMayerDev@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
 2023-12-11 15:51:29 +01:00
tobiasKaminsky
b336d01b4b
Report client health 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2023-12-11 14:47:03 +01:00
alperozturk
1461da205c
Remove two actions dialog due to inconsistency of upload 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-11 14:27:09 +01: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
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
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
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