mirrors/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-04-05 13:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix:

Browse source 
Database is 0 Byte if Yubikey save is canceled #1680
This commit is contained in:
J-Jamet 2024-05-13 12:16:42 +02:00
parent 9e714c4192
commit 05f689913f
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt
View file

@ -51,8 +51,10 @@ open class SaveDatabaseRunnable(
// Build temp database file to avoid file corruption if error // Build temp database file to avoid file corruption if error
database.saveData( database.saveData(
cacheFile = File(context.cacheDir, databaseCopyUri.hashCode().toString()), cacheFile = File(context.cacheDir, databaseCopyUri.hashCode().toString()),
databaseOutputStream = contentResolver databaseOutputStream = {
.getUriOutputStream(databaseCopyUri ?: database.fileUri), contentResolver
.getUriOutputStream(databaseCopyUri ?: database.fileUri)
},
isNewLocation = databaseCopyUri == null, isNewLocation = databaseCopyUri == null,
mainCredential?.toMasterCredential(contentResolver), mainCredential?.toMasterCredential(contentResolver),
challengeResponseRetriever) challengeResponseRetriever)

7
app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
View file

@ -273,13 +273,6 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
val responseChannel = mResponseChallengeChannel val responseChannel = mResponseChallengeChannel
if (responseChannel == null || responseChannel.isEmpty) { if (responseChannel == null || responseChannel.isEmpty) {
if (response.isEmpty()) { if (response.isEmpty()) {
Toast.makeText(
this@DatabaseTaskNotificationService,
getString(
R.string.error_action_empty_response_from_challenge),
Toast.LENGTH_LONG
).show()
mResponseChallengeChannel?.send(response)
cancelChallengeResponse(R.string.error_no_response_from_challenge) cancelChallengeResponse(R.string.error_no_response_from_challenge)
} else { } else {
mResponseChallengeChannel?.send(response) mResponseChallengeChannel?.send(response)

1
app/src/main/res/values/strings.xml
View file

@ -204,7 +204,6 @@
<string name="error_challenge_already_requested">"Challenge already requested"</string> <string name="error_challenge_already_requested">"Challenge already requested"</string>
<string name="error_response_already_provided">Response already provided.</string> <string name="error_response_already_provided">Response already provided.</string>
<string name="error_no_response_from_challenge">Unable to get the response from the challenge.</string> <string name="error_no_response_from_challenge">Unable to get the response from the challenge.</string>
<string name="error_action_empty_response_from_challenge">WARNING : Action performed with an empty challenge response.</string>
<string name="error_cancel_by_user">Cancelled by user.</string> <string name="error_cancel_by_user">Cancelled by user.</string>
<string name="error_driver_required">Driver for %1$s is required.</string> <string name="error_driver_required">Driver for %1$s is required.</string>
<string name="error_unable_merge_database_kdb">Unable to merge from a database V1.</string> <string name="error_unable_merge_database_kdb">Unable to merge from a database V1.</string>

4
database/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
View file

@ -779,7 +779,7 @@ open class Database {
@Throws(DatabaseOutputException::class) @Throws(DatabaseOutputException::class)
fun saveData( fun saveData(
cacheFile: File, cacheFile: File,
databaseOutputStream: OutputStream?, databaseOutputStream: () -> OutputStream?,
isNewLocation: Boolean, isNewLocation: Boolean,
masterCredential: MasterCredential?, masterCredential: MasterCredential?,
challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
@ -820,7 +820,7 @@ open class Database {
} }
} }
// Copy from the cache to the final stream // Copy from the cache to the final stream
databaseOutputStream?.use { outputStream -> databaseOutputStream.invoke()?.use { outputStream ->
cacheFile.inputStream().use { inputStream -> cacheFile.inputStream().use { inputStream ->
inputStream.readAllBytes { buffer -> inputStream.readAllBytes { buffer ->
outputStream.write(buffer) outputStream.write(buffer)