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 |
|
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
|
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 |
|
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 |
|
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 |
|