AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Select vault / masterkey file while adding a vault

Browse Source
This commit is contained in:
Julian Raufelder 2021-04-08 15:36:58 +02:00
parent e34597a716
commit 617c0386bf
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
presentation/src/main/java/org/cryptomator/presentation/intent/ChooseCloudNodeSettings.java
View File

@ -160,12 +160,19 @@ public class ChooseCloudNodeSettings implements Serializable {
return this; return this;
} }
public Builder selectingFilesWithNameOnly(String name) { public Builder selectingFileWithNameOnly(String name) {
this.selectionMode = FILES_ONLY; this.selectionMode = FILES_ONLY;
this.namePattern = Pattern.compile(Pattern.quote(name)); this.namePattern = Pattern.compile(Pattern.quote(name));
return this; 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) { public Builder selectingFoldersNotContaining(List<String> names) {
this.selectionMode = FOLDERS_ONLY; this.selectionMode = FOLDERS_ONLY;
this.excludeFolderContainingNames = names; this.excludeFolderContainingNames = names;

4
presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt
View File

@ -1,7 +1,6 @@
package org.cryptomator.presentation.ui.activity package org.cryptomator.presentation.ui.activity
import android.content.Intent import android.content.Intent
import android.os.Build
import android.view.Menu import android.view.Menu
import android.view.View import android.view.View
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
@ -229,9 +228,6 @@ class BrowseFilesActivity : BaseActivity(), //
override fun onPrepareOptionsMenu(menu: Menu): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
if (isNavigationMode(SELECT_ITEMS)) { 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_delete_items).isEnabled = enableGeneralSelectionActions
menu.findItem(R.id.action_move_items).isEnabled = enableGeneralSelectionActions menu.findItem(R.id.action_move_items).isEnabled = enableGeneralSelectionActions
menu.findItem(R.id.action_export_items).isEnabled = enableGeneralSelectionActions menu.findItem(R.id.action_export_items).isEnabled = enableGeneralSelectionActions

3
presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java
View File

@ -19,6 +19,7 @@ import org.cryptomator.presentation.model.mappers.CloudModelMapper;
import org.cryptomator.presentation.presenter.VaultListPresenter; import org.cryptomator.presentation.presenter.VaultListPresenter;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
@ -89,7 +90,7 @@ public class AddExistingVaultWorkflow extends Workflow<AddExistingVaultWorkflow.
.withExtraText(presenter() // .withExtraText(presenter() //
.context() // .context() //
.getString(R.string.screen_file_browser_add_existing_vault_extra_text)) // .getString(R.string.screen_file_browser_add_existing_vault_extra_text)) //
.selectingFilesWithNameOnly("masterkey.cryptomator") // .selectingFilesWithNameOnly(Arrays.asList("masterkey.cryptomator", "vault.cryptomator")) //
.build()), // .build()), //
SerializableResultCallbacks.cryptomatorFileChosen()); SerializableResultCallbacks.cryptomatorFileChosen());
} }

2
presentation/src/main/res/values/strings.xml
View File

@ -79,7 +79,7 @@
<string name="screen_file_browser_default_title">Vault</string> <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_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_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_button_text">Place here</string>
<string name="screen_file_browser_create_new_vault_extra_text">Vault name: %1$s</string> <string name="screen_file_browser_create_new_vault_extra_text">Vault name: %1$s</string>