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 errors highlight by @gaul fb715950a7

Browse Source
This commit is contained in:
J-Jamet
2018-07-04 13:19:06 +02:00
parent ab6c69adcb
commit ef83dbcae2
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/kunzisoft/keepass/database/EntrySearchV4.java
View File

@@ -57,7 +57,7 @@ public class EntrySearchV4 {
boolean negate = false;
if (sp.searchString.startsWith("-")) {
sp.searchString.substring(1); // TODO Verify bug or no need ?
sp.searchString = sp.searchString.substring(1);
negate = sp.searchString.length() > 0;
}

3
app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java
View File

@@ -687,8 +687,7 @@ public class PwDatabaseV4 extends PwDatabase<PwGroupV4, PwEntryV4> {
@Override
public void undoDeleteEntry(PwEntryV4 entry, PwGroupV4 origParent) {
super.undoDeleteEntry(entry, origParent);
// TODO undo delete entry
deletedObjects.remove(entry);
deletedObjects.remove(new PwDeletedObject(entry.getUUID()));
}
@Override

2
app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV4.java
View File

@@ -349,7 +349,7 @@ public class PwDbHeaderV4 extends PwDbHeader {
}
public static boolean matchesHeader(int sig1, int sig2) {
return (sig1 == PWM_DBSIG_1) && ( (sig2 == DBSIG_PRE2) || (sig2 == DBSIG_2) ); // TODO verify add DBSIG_PRE2
return (sig1 == PWM_DBSIG_1) && ( (sig2 == DBSIG_PRE2) || (sig2 == DBSIG_2) );
}
public static byte[] computeHeaderHmac(byte[] header, byte[] key) throws IOException{

6
app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java
View File

@@ -76,15 +76,19 @@ public class EntrySearchStringIteratorV3 extends EntrySearchStringIterator {
switch (current) {
case title:
found = sp.searchInTitles;
break;
case url:
found = sp.searchInUrls;
break;
case username:
found = sp.searchInUserNames;
found = sp.searchInUserNames;
break;
case comment:
found = sp.searchInNotes;
break;
default:
found = true;

2
app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java
View File

@@ -957,7 +957,7 @@ public class ImporterV4 extends Importer {
ReadUnknown(xpp);
}
assert(xpp.getName() == unknownName);
assert(xpp.getName().equals(unknownName));
}