Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class FileMenuFilterIT : AbstractIT() {
launchActivity<TestActivity>().use {
it.onActivity { activity ->
val filterFactory =
FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
FileMenuFilterFactory(mockStorageManager, activity, editorUtils)

var sut = filterFactory.newInstance(encryptedFolder, mockComponentsGetter, true, user)
var toHide = sut.getToHide(false)
Expand Down Expand Up @@ -234,7 +234,7 @@ class FileMenuFilterIT : AbstractIT() {
launchActivity<TestActivity>().use {
it.onActivity { activity ->
val filterFactory =
FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
FileMenuFilterFactory(mockStorageManager, activity, editorUtils)

var sut = filterFactory.newInstance(encryptedVideo, mockComponentsGetter, true, user)
var toHide = sut.getToHide(false)
Expand All @@ -259,7 +259,7 @@ class FileMenuFilterIT : AbstractIT() {

launchActivity<TestActivity>().use {
it.onActivity { activity ->
val filterFactory = FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
val filterFactory = FileMenuFilterFactory(mockStorageManager, activity, editorUtils)

val files = listOf(OCFile("/foo.bin"), OCFile("/bar.bin"), OCFile("/baz.bin"))

Expand Down Expand Up @@ -298,7 +298,7 @@ class FileMenuFilterIT : AbstractIT() {

launchActivity<TestActivity>().use {
it.onActivity { activity ->
val filterFactory = FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
val filterFactory = FileMenuFilterFactory(mockStorageManager, activity, editorUtils)

val files = listOf(OCFile("/foo.bin"), OCFile("/bar.bin"), OCFile("/baz.bin"))

Expand Down Expand Up @@ -344,7 +344,7 @@ class FileMenuFilterIT : AbstractIT() {

launchActivity<TestActivity>().use {
it.onActivity { activity ->
val filterFactory = FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
val filterFactory = FileMenuFilterFactory(mockStorageManager, activity, editorUtils)

val downloadedToHide = filterFactory
.newInstance(downloadedFile, mockComponentsGetter, true, user)
Expand Down Expand Up @@ -376,7 +376,7 @@ class FileMenuFilterIT : AbstractIT() {

launchActivity<TestActivity>().use {
it.onActivity { activity ->
val filterFactory = FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
val filterFactory = FileMenuFilterFactory(mockStorageManager, activity, editorUtils)

val toHide = filterFactory
.newInstance(file, mockComponentsGetter, true, user)
Expand All @@ -403,7 +403,7 @@ class FileMenuFilterIT : AbstractIT() {

launchActivity<TestActivity>().use {
it.onActivity { activity ->
val filterFactory = FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
val filterFactory = FileMenuFilterFactory(mockStorageManager, activity, editorUtils)

val toHide = filterFactory
.newInstance(file, mockComponentsGetter, true, user)
Expand Down Expand Up @@ -433,7 +433,7 @@ class FileMenuFilterIT : AbstractIT() {
launchActivity<TestActivity>().use {
it.onActivity { activity ->
val filterFactory =
FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
FileMenuFilterFactory(mockStorageManager, activity, editorUtils)
val sut = filterFactory.newInstance(file, mockComponentsGetter, true, user)

val toHide = sut.getToHide(false)
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,19 @@ enum class FileAction(
}

companion object {
val READ_ONLY_HIDDEN_ACTIONS = listOf(
R.id.action_remove_file,
R.id.action_rename_file,
R.id.action_move_or_copy,
R.id.action_edit,
R.id.action_encrypted,
R.id.action_unset_encrypted,
R.id.action_lock_file,
R.id.action_unlock_file,
R.id.action_favorite,
R.id.action_unset_favorite
)

/**
* All file actions, in the order they should be displayed
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import com.nextcloud.client.account.CurrentAccountProvider
import com.nextcloud.client.logger.Logger
import com.nextcloud.utils.AppConstants
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.files.FileMenuFilter
import com.owncloud.android.files.FileMenuFilterFactory
import com.owncloud.android.lib.resources.files.model.FileLockType
import com.owncloud.android.ui.activity.ComponentsGetter
import kotlinx.coroutines.Dispatchers
Expand All @@ -26,7 +26,7 @@ import javax.inject.Inject

class FileActionsViewModel @Inject constructor(
private val currentAccountProvider: CurrentAccountProvider,
private val filterFactory: FileMenuFilter.Factory,
private val filterFactory: FileMenuFilterFactory,
private val logger: Logger
) : ViewModel() {

Expand Down
Loading
Loading