mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
22518 commits 227 branches 1574 tags 621 MiB
Commit graph

3247 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
alperozturk
21466b5217
Add fixme 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-06 14:47:33 +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
alperozturk
1b403ab1c0
Add remove action 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-06 14:34:21 +01:00
alperozturk
f4ffe4fdae
Add actions 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-06 14:26:43 +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
alperozturk
5f99e4379d
Add Two Action Dialog button 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
 2023-12-06 14:02:09 +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