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

Fix education hint in selection mode #600

Browse Source
This commit is contained in:
J-Jamet
2020-07-06 15:59:14 +02:00
parent d5ece8d007
commit a410ef5d9f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -402,12 +402,18 @@ 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 = createDatabaseButtonView != null && createDatabaseButtonView!!.visibility == View.VISIBLE
val createDatabaseEducationPerformed =
createButton != null && createButton.visibility == View.VISIBLE
&& mAdapterDatabaseHistory != null
&& mAdapterDatabaseHistory!!.itemCount > 0
&& fileDatabaseSelectActivityEducation.checkAndPerformedCreateDatabaseEducation(
createDatabaseButtonView!!,
createButton,
{
createNewFile()
},
@@ -417,9 +423,9 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
})
if (!createDatabaseEducationPerformed) {
// selectDatabaseEducationPerformed
openDatabaseButtonView != null
openButton != null
&& fileDatabaseSelectActivityEducation.checkAndPerformedSelectDatabaseEducation(
openDatabaseButtonView!!,
openButton,
{tapTargetView ->
tapTargetView?.let {
mOpenFileHelper?.openFileOnClickViewListener?.onClick(it)