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 algorithm and kdf function for database V3 and add small trad

Browse Source
This commit is contained in:
J-Jamet
2018-05-13 13:55:37 +02:00
parent 7bcc289518
commit 92eeccf84e
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/kunzisoft/keepass/database/Database.java
View File

@@ -360,11 +360,14 @@ public class Database {
return new ArrayList<>();
}
public boolean allowEncryptionAlgorithmModification() {
return getAvailableEncryptionAlgorithms().size() > 1;
}
public void assignEncryptionAlgorithm(PwEncryptionAlgorithm algorithm) {
switch (getPwDatabase().getVersion()) {
case V4:
((PwDatabaseV4) getPwDatabase()).setEncryptionAlgorithm(algorithm);
// TODO Simplify
((PwDatabaseV4) getPwDatabase()).setDataEngine(algorithm.getCipherEngine());
((PwDatabaseV4) getPwDatabase()).setDataCipher(algorithm.getDataCipher());
}
@@ -384,6 +387,10 @@ public class Database {
return new ArrayList<>();
}
public boolean allowKdfModification() {
return getAvailableKdfEngines().size() > 1;
}
public KdfEngine getKdfEngine() {
return getPwDatabase().getKdfEngine();
}

3
app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.java
View File

@@ -66,7 +66,8 @@ public class DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat extends D
@Override
public void onDialogClosed(boolean positiveResult) {
if ( positiveResult ) {
if ( positiveResult
&& database.allowEncryptionAlgorithmModification()) {
assert getContext() != null;
if (algorithmSelected != null) {

3
app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.java
View File

@@ -70,7 +70,8 @@ public class DatabaseKeyDerivationPreferenceDialogFragmentCompat extends Databas
@Override
public void onDialogClosed(boolean positiveResult) {
if ( positiveResult ) {
if ( positiveResult
&& database.allowKdfModification()) {
assert getContext() != null;
if (kdfEngineSelected != null) {

4
app/src/main/res/values-fr/strings.xml
View File

@@ -27,7 +27,9 @@
<string name="add_entry">Ajouter une entrée</string>
<string name="add_group">Ajouter un groupe</string>
<string name="add_string">Ajouter une chaîne</string>
<string name="encryption_algorithm">Algorithme</string>
<string name="encryption">Chiffrement</string>
<string name="encryption_algorithm">Algorithme de Chiffrement</string>
<string name="key_derivation_function">Fonction de dérivation de clé</string>
<string name="app_timeout">Application timeout</string>
<string name="app_timeout_summary">Temps avant le verrouillage de la base de données lorsque l\'application est inactive.</string>
<string name="application">Application</string>