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

3632 commits

Author SHA1 Message Date
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
4c944ebeba daily dev 20231220 
Update Nextcloud Android library
Update 3rd-party dependencies
 2023-12-20 03:41:50 +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
87797b2264 daily dev 20231219 
Update Nextcloud Android library
 2023-12-19 03:41:49 +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
fd57674160 daily dev 20231216 2023-12-16 02:36:18 +01: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
8e55cffa10
Fix ss tests 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-15 11:13:32 +01:00
tobiasKaminsky
b318e653fe
add screenshots 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2023-12-15 10:36:06 +01:00
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
Tobias Kaminsky
fc930f8e33 daily dev 20231215 
Update Nextcloud Android library
 2023-12-15 03:39:34 +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
d2a8c75790 daily dev 20231214 
Update Nextcloud Android library
 2023-12-14 03:40:21 +01: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
31f1b204e6 daily dev 20231213 2023-12-13 02:36:30 +01: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
f96c168177 daily dev 20231212 
Update 3rd-party dependencies
 2023-12-12 02:36:33 +01: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
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