diff --git a/presentation/src/main/java/org/cryptomator/presentation/intent/ChooseCloudNodeSettings.java b/presentation/src/main/java/org/cryptomator/presentation/intent/ChooseCloudNodeSettings.java index bfeb8104..f4699431 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/intent/ChooseCloudNodeSettings.java +++ b/presentation/src/main/java/org/cryptomator/presentation/intent/ChooseCloudNodeSettings.java @@ -160,12 +160,19 @@ public class ChooseCloudNodeSettings implements Serializable { return this; } - public Builder selectingFilesWithNameOnly(String name) { + public Builder selectingFileWithNameOnly(String name) { this.selectionMode = FILES_ONLY; this.namePattern = Pattern.compile(Pattern.quote(name)); return this; } + public Builder selectingFilesWithNameOnly(List names) { + this.selectionMode = FILES_ONLY; + String pattern = names.stream().map(Pattern::quote).reduce(Pattern.quote(""), (p1, p2) -> p1 + "|" + p2); + this.namePattern = Pattern.compile(pattern); + return this; + } + public Builder selectingFoldersNotContaining(List names) { this.selectionMode = FOLDERS_ONLY; this.excludeFolderContainingNames = names; diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt index 210cb3c6..e828c74c 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt @@ -1,7 +1,6 @@ package org.cryptomator.presentation.ui.activity import android.content.Intent -import android.os.Build import android.view.Menu import android.view.View import androidx.appcompat.widget.SearchView @@ -229,9 +228,6 @@ class BrowseFilesActivity : BaseActivity(), // override fun onPrepareOptionsMenu(menu: Menu): Boolean { if (isNavigationMode(SELECT_ITEMS)) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - menu.findItem(R.id.action_export_items).isVisible = false - } menu.findItem(R.id.action_delete_items).isEnabled = enableGeneralSelectionActions menu.findItem(R.id.action_move_items).isEnabled = enableGeneralSelectionActions menu.findItem(R.id.action_export_items).isEnabled = enableGeneralSelectionActions diff --git a/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java b/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java index 2837cbb0..1d5041ff 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java +++ b/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java @@ -19,6 +19,7 @@ import org.cryptomator.presentation.model.mappers.CloudModelMapper; import org.cryptomator.presentation.presenter.VaultListPresenter; import java.io.Serializable; +import java.util.Arrays; import java.util.List; import javax.inject.Inject; @@ -89,7 +90,7 @@ public class AddExistingVaultWorkflow extends WorkflowVault @string/screen_vault_list_action_add_existing_vault - Select masterkey file + Select vault or masterkey file @string/screen_vault_list_action_create_new_vault Place here Vault name: %1$s