rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow open database during selection mode #608

Browse Source
This commit is contained in:
J-Jamet
2020-07-06 17:55:08 +02:00
parent a410ef5d9f
commit 2b17d56fc7
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
View File

@@ -65,7 +65,6 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
// Views
private var coordinatorLayout: CoordinatorLayout? = null
private var fileManagerExplanationButton: View? = null
private var databaseButtonsContainerView: View? = null
private var createDatabaseButtonView: View? = null
private var openDatabaseButtonView: View? = null
@@ -97,8 +96,6 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
UriUtil.gotoUrl(this, R.string.file_manager_explanation_url)
}
databaseButtonsContainerView = findViewById(R.id.database_buttons_container)
// Create database button
createDatabaseButtonView = findViewById(R.id.create_database_button)
createDatabaseButtonView?.setOnClickListener { createNewFile() }
@@ -271,8 +268,8 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
// Show open and create button or special mode
if (mSelectionMode) {
// Disable buttons if in selection mode or request for autofill
databaseButtonsContainerView?.visibility = View.GONE
// Disable create button if in selection mode or request for autofill
createDatabaseButtonView?.visibility = View.GONE
} else {
if (allowCreateDocumentByStorageAccessFramework(packageManager)) {
// There is an activity which can handle this intent.
@@ -281,7 +278,6 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
// No Activity found that can handle this intent.
createDatabaseButtonView?.visibility = View.GONE
}
databaseButtonsContainerView?.visibility = View.VISIBLE
}
val database = Database.getInstance()
@@ -402,18 +398,13 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
}
private fun performedNextEducation(fileDatabaseSelectActivityEducation: FileDatabaseSelectActivityEducation) {
val databaseButtonsVisible = databaseButtonsContainerView?.visibility == View.VISIBLE
val createButton = if (databaseButtonsVisible) createDatabaseButtonView else null
val openButton = if (databaseButtonsVisible) openDatabaseButtonView else null
// If no recent files
val createDatabaseEducationPerformed =
createButton != null && createButton.visibility == View.VISIBLE
createDatabaseButtonView != null && createDatabaseButtonView!!.visibility == View.VISIBLE
&& mAdapterDatabaseHistory != null
&& mAdapterDatabaseHistory!!.itemCount > 0
&& fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
createButton,
createDatabaseButtonView!!,
{
createNewFile()
},
@@ -423,9 +414,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
})
if (!createDatabaseEducationPerformed) {
// selectDatabaseEducationPerformed
openButton != null
openDatabaseButtonView != null
&& fileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
openButton,
openDatabaseButtonView!!,
{tapTargetView ->
tapTargetView?.let {
mOpenFileHelper?.openFileOnClickViewListener?.onClick(it)