From 617c0386bf144d54537994811e776e4541c4cc87 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Thu, 8 Apr 2021 15:36:58 +0200
Subject: [PATCH] Select vault / masterkey file while adding a vault

---
 .../presentation/intent/ChooseCloudNodeSettings.java     | 9 ++++++++-
 .../presentation/ui/activity/BrowseFilesActivity.kt      | 4 ----
 .../presentation/workflow/AddExistingVaultWorkflow.java  | 3 ++-
 presentation/src/main/res/values/strings.xml             | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

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<String> 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<String> 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 Workflow<AddExistingVaultWorkflow.
 														.withExtraText(presenter() //
 																.context() //
 																.getString(R.string.screen_file_browser_add_existing_vault_extra_text)) //
-														.selectingFilesWithNameOnly("masterkey.cryptomator") //
+														.selectingFilesWithNameOnly(Arrays.asList("masterkey.cryptomator", "vault.cryptomator")) //
 														.build()), //
 								SerializableResultCallbacks.cryptomatorFileChosen());
 					}
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index 6ef89ee7..a8d0920f 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -79,7 +79,7 @@
 	<string name="screen_file_browser_default_title">Vault</string>
 
 	<string name="screen_file_browser_subtitle_add_existing_vault">@string/screen_vault_list_action_add_existing_vault</string>
-	<string name="screen_file_browser_add_existing_vault_extra_text">Select masterkey file</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Select vault or masterkey file</string>
 	<string name="screen_file_browser_subtitle_create_new_vault">@string/screen_vault_list_action_create_new_vault</string>
 	<string name="screen_file_browser_create_new_vault_button_text">Place here</string>
 	<string name="screen_file_browser_create_new_vault_extra_text">Vault name: %1$s</string>