Commit graph

177 commits

Author SHA1 Message Date
Nextcloud bot
76ab52499d
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-05-03 04:11:34 +00:00
Álvaro Brey
3c97b4b619
Merge pull request #10133 from nextcloud/fix/more-scrolling-bugs
Fix contents cut off when scrolling is locked
2022-05-02 18:10:53 +02:00
Álvaro Brey
f0b77e5751
Merge pull request #10052 from nextcloud/file_locking
File locking
2022-05-02 17:19:49 +02:00
Álvaro Brey
26aef8e462
Merge pull request #10134 from nextcloud/fix/dagger-mediacontrolview
Fix theme utils injection in custom views
2022-05-02 17:19:30 +02:00
Álvaro Brey
d34d3b419a
Fix mocking in FileMenuFilterIT
Not sure why this wasn't a compilation error

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-02 15:43:12 +02:00
Álvaro Brey Vilas
81ce812d86
Fix some licenses
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:43 +02:00
Álvaro Brey Vilas
3eb3079757
Fix spotbugs
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:43 +02:00
Álvaro Brey Vilas
f079f030cf
Remove unused resources
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:43 +02:00
Álvaro Brey Vilas
f50d9f8451
Add test for FileMenuFilter that verifies file locking menu items
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:43 +02:00
Álvaro Brey Vilas
6d40f25f29
Add unit tests for FileLockingHelper
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:43 +02:00
Álvaro Brey Vilas
2cd2e29b86
FileMenuFilter: don't show lock options if there's no locking capability
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:43 +02:00
Álvaro Brey Vilas
db30142ad3
Fix lock info in actionMode menu when selecting a single, locked, file
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:43 +02:00
Álvaro Brey Vilas
f8ad9ae413
FileMenuFilter: don't show move, remove or rename options when file is locked
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:43 +02:00
Álvaro Brey Vilas
d90083fc07
Show file lock info in actions menu instead of separate dialog
Requested by design team

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:43 +02:00
Álvaro Brey Vilas
46ccddcef4
Combine lock indicator with overflow icon
Requested by design

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:42 +02:00
Álvaro Brey Vilas
a902fb6f84
FileMenuFilter: properly filter lock/unlock depending on lock status
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:42 +02:00
Álvaro Brey Vilas
a88b03a0c8
Show lock details when tapping on lock indicator
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:42 +02:00
Álvaro Brey Vilas
68b2535481
Retrieve and persist more locking attributes from remote files
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:42 +02:00
Álvaro Brey Vilas
356db04aa8
Add ability to toggle file lock from file context menu
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:42 +02:00
Álvaro Brey Vilas
fd2435379a
FileDataStorageManager: small cleanup
- Remove two unused methods
- Make some fields final

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:42 +02:00
Álvaro Brey Vilas
f5ecaf91d1
Show file locking status on list
Also includes a refactor of how ContentValues are created in FileDataStorageManager.

The code for that was triplicated. now it's not.

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:42 +02:00
Álvaro Brey Vilas
b8cf8dade8
Store file locking capability
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 12:49:36 +02:00
Álvaro Brey
9a2cbcbba4
FileDisplayActivity: wait until OCFileListFragment is initialized to trigger browseToRoot()
This solves a bug which caused a "Directory does not exist" popup when coming back from Gallery,
as it tried to call browseToRoot on GalleryFragment due it being executed before the fragment transaction.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-05-02 11:02:46 +02:00
Álvaro Brey Vilas
13e061e7d7 PreviewMediaFragment: Remove margin from top bar
Not needed since previous commit fixing scroll bugs, creates unwanted space

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 07:55:34 +00:00
Álvaro Brey Vilas
7a2c735795 Fix contents cut off when scrolling is locked
Don't need to touch the coordinator params, just set scroll flags properly

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-05-02 07:55:34 +00:00
Álvaro Brey
2bb8c91965
Merge pull request #10132 from nextcloud/chore/cleanup-repositories
build: Clean up repository configuration
2022-05-02 09:45:42 +02:00
Nextcloud bot
ddb96e7b17
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-05-01 04:10:03 +00:00
Álvaro Brey Vilas
2560d1be3c
Inject ThemeColorUtils into ThemeableSwitchPreference too
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 16:56:56 +02:00
Álvaro Brey Vilas
b58749d459
Fix ThemeUtils injection for MediaControlView
Inflation of this view was failing as there was no proper constructor

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 16:50:35 +02:00
Álvaro Brey Vilas
2bd8fb4240
build: Update last 2 libraries that used JCenter
Both of these are present in mavenCentral with a different groupId.

For both of them, the version bump is only for the groupId change, there are no breaking changes otherwise.

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 16:13:04 +02:00
Álvaro Brey Vilas
9463d2e668
build: Clean up repository configuration
- Put jitpack.io at the bottom, so that it is the last one checked. For libraries that are both in jitpack and elsewhere,
this should prevent a lot of errors especially in CI due to jitpack unreliability.
- Don't use gradle plugin portal as a mirror for JCenter. JCenter is still up as read-only, and using the gradle plugin portal
hides the fact that we have stop using jcenter libraries.
- For buildscripts, use gradlePluginPortal() instead of manual maven config
- Don't have repository configuration in both app/build.gradle and project build.gradle. Use project gradle instead

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 16:07:55 +02:00
Álvaro Brey Vilas
7e31a71ba0 FileDetailsSharing: Preserve selected date when recreating expiration date dialog
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 11:12:07 +00:00
Álvaro Brey Vilas
85dcbe542e FileDetailsSharingProcess: force recreation of date picked on config changes
See added comment for details

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 11:12:07 +00:00
Álvaro Brey Vilas
8c2fc3ee87 ExpirationDatePickerDF: customize buttons on onStart instead of showing dialog on onCreate
That is how DialogFragment is supposed to work

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 11:12:07 +00:00
Álvaro Brey Vilas
21ed337184
build: Disable LeakCanary unless manually activated with a property
Use `./gradlew installGplayDebug -P "leakCanary"`, for example, to activate it.

LeakCanary dramatically slows down normal development work due to app freezes for memory dumps.

This way we can avoid that, but still use it when we want to check for leaks. I don't think leaks should be a primary focus right now,
since we have other stuff to work on first.

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 11:43:11 +02:00
Álvaro Brey Vilas
4ff54bb48b Fix and update testBottomSheet screenshot test
We can't edit the capability in FDA directly

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 06:38:14 +00:00
Álvaro Brey Vilas
bdd1daa10e SyncFileNotEnoughSpaceDialogFragment needs injector
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 06:38:14 +00:00
Álvaro Brey Vilas
e023cedd7f Fix GalleryAdapterTest
GalleryAdapter needs theme stuff now

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 06:38:14 +00:00
Álvaro Brey Vilas
3ff35d46e6 Fix some spotbugs stuff
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 06:38:14 +00:00
Álvaro Brey Vilas
56584c06e6 Fix detekt
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 06:38:14 +00:00
Álvaro Brey Vilas
42c28dce70 ThemeModule: convert to Kotlin and fix copyright
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 06:38:14 +00:00
tobiasKaminsky
17828cb3b4 remove some spotbugs warnings
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-04-29 06:38:14 +00:00
Álvaro Brey Vilas
f627f3d976 Fix injection ofr RenameFileDialogFragment
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 06:38:14 +00:00
Álvaro Brey Vilas
6bd7d808f4 Put OCFileListBottomSheetDialog into a DialogFragment
Can't inject things into a Dialog

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 06:38:13 +00:00
tobiasKaminsky
74e17ee7c6 Fixes after rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Fixes after rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Fixes after rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Fix after rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-04-29 06:38:13 +00:00
Álvaro Brey Vilas
75cb8a767c Remove SyncedFoldersActivity.java
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-29 06:38:13 +00:00
tobiasKaminsky
349a045b46 Move all Theme classes to DI
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Move all Theme classes to DI

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Move all Theme classes to DI

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-04-29 06:38:13 +00:00
Nextcloud bot
0a802b51da
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-29 04:11:37 +00:00
Álvaro Brey
c81c1c83aa
Merge pull request #10117 from nextcloud/chore/screenshot-test-reliability
Screenshot tests reliability improvements
2022-04-28 14:05:23 +02:00
Álvaro Brey Vilas
bc44b2c524
PasscodeActivityIT: add short sleep after closing keyboard
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
2022-04-28 11:09:19 +02:00