Tobias Kaminsky
989ad4c096
Merge remote-tracking branch 'origin/master' into dev
2022-12-16 03:35:11 +01:00
Álvaro Brey
6d4a65b45c
FolderPickerActivity: also disable action when trying to move or copy a folder to a descendant of itself
...
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-12-15 17:22:11 +01:00
dependabot[bot]
e06b46660a
Bump mockitoVersion from 4.9.0 to 4.10.0
...
Bumps `mockitoVersion` from 4.9.0 to 4.10.0.
Updates `mockito-core` from 4.9.0 to 4.10.0
- [Release notes](https://github.com/mockito/mockito/releases )
- [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v4.10.0 )
Updates `mockito-android` from 4.9.0 to 4.10.0
- [Release notes](https://github.com/mockito/mockito/releases )
- [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v4.10.0 )
---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.mockito:mockito-android
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-15 11:57:11 +00:00
Álvaro Brey
04ffe37d25
FolderPickerActivity: remove EXTRA_CURRENT_FOLDER argument
...
It was unused (as it never reached the OCFileListFragment, which always starts at /) but was
mistakenly pre-populating the `file` variable with a wrong folder
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-12-15 11:15:31 +01:00
Álvaro Brey
a824d9a7b5
FolderPickerActivity: properly compare subfolders
...
Need to use File as well, otherwise trailing slashes are different
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-12-15 11:15:31 +01:00
Álvaro Brey
3cfd729b3c
FolderPickerActivity: disable copy/move to the same folder
...
It's a no-op anyways, right now, and causes bad UX
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-12-15 11:15:25 +01:00
Álvaro Brey
9f5ca72cb0
Merge pull request #11171 from nextcloud/fix/build-nextcloudversion
...
Fix build failure after update in library
2022-12-15 11:14:49 +01:00
Álvaro Brey
414e573ee6
Fix build failure after update in library
...
NextcloudVersion now has @JvmStatic in all members, so getters do no longer exist
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-12-15 10:57:33 +01:00
Nextcloud bot
15a7173603
[tx-robot] updated from transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-15 03:31:27 +00:00
Nextcloud bot
9b5dfddfd0
[tx-robot] Update transifex configuration
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-15 03:31:11 +00:00
Tobias Kaminsky
bee9985fd5
daily dev 20221215
...
Update Nextcloud Android library
2022-12-15 03:40:10 +01:00
Tobias Kaminsky
e0cc009c43
Merge remote-tracking branch 'origin/master' into dev
2022-12-15 03:35:19 +01:00
Álvaro Brey
b769ab712b
Merge pull request #11167 from nextcloud/repo-sync/android-config/master
...
🔄 Synced file(s) with nextcloud/android-config
2022-12-14 17:43:39 +01:00
nextcloud-android-bot
5e3263cd2c
🔄 Synced local '.github/workflows/' with remote 'config/workflows/'
...
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2022-12-14 13:49:56 +00:00
Nextcloud bot
62f01e34c1
[tx-robot] updated from transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-14 03:34:37 +00:00
Nextcloud bot
57591684d7
[tx-robot] Update transifex configuration
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-14 03:34:21 +00:00
Tobias Kaminsky
ecd7fd6d20
daily dev 20221214
...
Bump firebase-messaging from 23.1.0 to 23.1.1
Bump fragment-ktx from 1.5.4 to 1.5.5
Update 3rd-party dependencies
2022-12-14 02:35:55 +01:00
Tobias Kaminsky
620abbf760
Merge remote-tracking branch 'origin/master' into dev
2022-12-14 02:30:54 +01:00
Dariusz Olszewski
69344bd8fb
Remove TODOs as discussed
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
07f61fcfa2
Apply suggestion from code review - FileDataStorageManager
...
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Dariusz Olszewski <8277636+starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
1a669e4eb6
Apply suggestions from code review
...
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Dariusz Olszewski <8277636+starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
0fb3c92495
Fix compilation of tests (revert marking getFileByEncryptedRemotePath as @Nullable)
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
4df8946b5e
spotlessKotlinCheck
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
9cbaa00724
SpotBugs
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
8ec6e3a0af
Use Room/DAO for getFolderWithDescendants (used by moveLocalFile) and finally remove createFileInstance(cursor) - no longer needed
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
e76201d59f
Use Room/DAO for getGalleryItems and getAllFiles
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
8272facf41
Use Room/DAO for other getFileByX and fileExists
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
5d8bb3e8f5
Simplify getFileById - as suggested in review comment
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Álvaro Brey
dd8a70262e
FileEntity: fix parent and contentLength types
...
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
71180412f9
Use Room/DAO for getFileById
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
32a7120610
Old implementation of getFolderContent ordered results by file name
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
45b9006068
Convert NULL values for integer/long columns to 0 (SpotBugs)
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
1d44674d83
Seems that timestamps need Long rather than Int
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
092a3051df
Missing newline (detekt)
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Dariusz Olszewski
cdeff1696b
Use Room/DAO for getFolderContent
...
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-12-13 23:28:15 +01:00
Álvaro Brey
cd36721f2b
Merge pull request #11156 from nextcloud/dependabot/gradle/com.google.firebase-firebase-messaging-23.1.1
...
Bump firebase-messaging from 23.1.0 to 23.1.1
2022-12-13 17:38:31 +01:00
Álvaro Brey
6284acebc4
Merge pull request #11151 from nextcloud/dependabot/gradle/androidx.fragment-fragment-ktx-1.5.5
...
Bump fragment-ktx from 1.5.4 to 1.5.5
2022-12-13 17:33:32 +01:00
Álvaro Brey
c0788b11b0
Merge pull request #11139 from nextcloud/doNotDeleteEncryptedFolder
...
Encrypted folder cannot be deleted, must first unset encryption
2022-12-13 16:57:42 +01:00
Nextcloud bot
3c945f6fb2
[tx-robot] updated from transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-13 03:44:38 +00:00
Nextcloud bot
1d026aae34
[tx-robot] Update transifex configuration
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-13 03:44:22 +00:00
Tobias Kaminsky
dcfd42e5b9
daily dev 20221213
2022-12-13 02:35:54 +01:00
Tobias Kaminsky
eba4cc8404
Merge remote-tracking branch 'origin/master' into dev
2022-12-13 02:31:01 +01:00
dependabot[bot]
9f4d59b3e3
Bump firebase-messaging from 23.1.0 to 23.1.1
...
Bumps firebase-messaging from 23.1.0 to 23.1.1.
---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-messaging
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-12 14:11:09 +00:00
Álvaro Brey
66c617828a
Merge pull request #11124 from nextcloud/fix/upload-worker-infinite-loop
...
Fix infinite loop in upload worker
2022-12-12 13:14:20 +01:00
Álvaro Brey
396b920d4f
Merge pull request #11119 from nextcloud/fix/fullscreen-dialog-insets-android9
...
PreviewVideoFullscreenDialog: fix immersive mode logic
2022-12-12 12:46:27 +01:00
Nextcloud bot
84754790bd
[tx-robot] updated from transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-12 03:31:14 +00:00
Nextcloud bot
022b076ec0
[tx-robot] Update transifex configuration
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-12 03:30:56 +00:00
Nextcloud bot
45d1183749
[tx-robot] updated from transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-11 03:42:48 +00:00
Nextcloud bot
700d9806c8
[tx-robot] Update transifex configuration
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-11 03:42:33 +00:00
Nextcloud bot
cfcf6036ab
[tx-robot] updated from transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-10 03:38:56 +00:00