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

Beter code

Browse Source
This commit is contained in:
J-Jamet
2019-10-24 11:07:58 +02:00
parent 2c5dcc9b11
commit 0d756db8aa
6 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
View File

@@ -581,6 +581,7 @@ class GroupActivity : LockingActivity(),
)
}
}
else -> {}
}
return true
}

1
app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt
View File

@@ -328,6 +328,7 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
R.id.menu_paste -> {
val returnValue = menuListener.onPasteMenuClick(nodeActionPasteMode, nodes)
nodeActionPasteMode = PasteMode.UNDEFINED
nodeActionSelectionMode = false
returnValue
}
else -> false

9
app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt
View File

@@ -26,12 +26,13 @@ import com.kunzisoft.keepass.tasks.ActionRunnable
import java.io.IOException
abstract class SaveDatabaseRunnable(protected var context: Context,
protected var database: Database,
private val save: Boolean,
nestedAction: ActionRunnable? = null) : ActionRunnable(nestedAction) {
protected var database: Database,
protected var saveDatabase: Boolean,
nestedAction: ActionRunnable? = null)
: ActionRunnable(nestedAction) {
override fun run() {
if (save) {
if (saveDatabase) {
try {
database.saveData(context.contentResolver)
} catch (e: IOException) {

7
app/src/main/java/com/kunzisoft/keepass/database/action/node/ActionNodeDatabaseRunnable.kt
View File

@@ -3,6 +3,7 @@ package com.kunzisoft.keepass.database.action.node
import android.content.Context
import com.kunzisoft.keepass.database.action.SaveDatabaseRunnable
import com.kunzisoft.keepass.database.element.Database
import com.kunzisoft.keepass.database.exception.LoadDatabaseException
abstract class ActionNodeDatabaseRunnable(
context: Context,
@@ -23,6 +24,12 @@ abstract class ActionNodeDatabaseRunnable(
}
}
protected fun throwErrorAndFinish(throwable: LoadDatabaseException) {
saveDatabase = false
super.run()
finishRun(false, throwable)
}
override fun run() {
nodeAction()
}

6
app/src/main/java/com/kunzisoft/keepass/database/action/node/CopyNodesRunnable.kt
View File

@@ -43,7 +43,7 @@ class CopyNodesRunnable constructor(
when (currentNode.type) {
Type.GROUP -> {
Log.e(TAG, "Copy not allowed for group")// Only finish thread
finishRun(false, CopyDatabaseGroupException())
throwErrorAndFinish(CopyDatabaseGroupException())
}
Type.ENTRY -> {
// Root can contains entry
@@ -55,11 +55,11 @@ class CopyNodesRunnable constructor(
mEntriesCopied.add(entryCopied)
} ?: run {
Log.e(TAG, "Unable to create a copy of the entry")
finishRun(false, CopyDatabaseEntryException())
throwErrorAndFinish(CopyDatabaseEntryException())
}
} else {
// Only finish thread
finishRun(false, CopyDatabaseEntryException())
throwErrorAndFinish(CopyDatabaseEntryException())
}
}
}

4
app/src/main/java/com/kunzisoft/keepass/database/action/node/MoveNodesRunnable.kt
View File

@@ -52,7 +52,7 @@ class MoveNodesRunnable constructor(
database.moveGroupTo(groupToMove, mNewParent)
} else {
// Only finish thread
finishRun(false, MoveDatabaseGroupException())
throwErrorAndFinish(MoveDatabaseGroupException())
}
}
Type.ENTRY -> {
@@ -64,7 +64,7 @@ class MoveNodesRunnable constructor(
database.moveEntryTo(entryToMove, mNewParent)
} else {
// Only finish thread
finishRun(false, MoveDatabaseEntryException())
throwErrorAndFinish(MoveDatabaseEntryException())
}
}
}