Commit graph

3531 commits

Author SHA1 Message Date
Tobias Kaminsky
02058b619e daily dev 20231221 2023-12-21 02:36:18 +01:00
Tobias Kaminsky
11fc9875d7 Merge remote-tracking branch 'origin/master' into dev 2023-12-21 02:31:07 +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