mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Handle changes to search helper.
This commit is contained in:
@@ -185,9 +185,11 @@ public class Database {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void initSearch() {
|
public void initSearch() {
|
||||||
searchHelper.open();
|
if ( searchHelper != null ) {
|
||||||
searchHelper.clear();
|
searchHelper.open();
|
||||||
searchHelper.close();
|
searchHelper.clear();
|
||||||
|
searchHelper.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import org.phoneid.keepassj2me.PwGroup;
|
|||||||
import org.phoneid.keepassj2me.Types;
|
import org.phoneid.keepassj2me.Types;
|
||||||
|
|
||||||
import com.keepassdroid.Database;
|
import com.keepassdroid.Database;
|
||||||
|
import com.keepassdroid.search.SearchDbHelper;
|
||||||
|
|
||||||
public class AddEntry extends RunnableOnFinish {
|
public class AddEntry extends RunnableOnFinish {
|
||||||
private Database mDb;
|
private Database mDb;
|
||||||
@@ -76,7 +77,10 @@ public class AddEntry extends RunnableOnFinish {
|
|||||||
mDb.gEntries.put(Types.bytestoUUID(mEntry.uuid), new WeakReference<PwEntry>(mEntry));
|
mDb.gEntries.put(Types.bytestoUUID(mEntry.uuid), new WeakReference<PwEntry>(mEntry));
|
||||||
|
|
||||||
// Add entry to search index
|
// Add entry to search index
|
||||||
mDb.searchHelper.insertEntry(mEntry);
|
SearchDbHelper helper = mDb.searchHelper;
|
||||||
|
helper.open();
|
||||||
|
helper.insertEntry(mEntry);
|
||||||
|
helper.close();
|
||||||
} else {
|
} else {
|
||||||
// Remove from group
|
// Remove from group
|
||||||
mEntry.parent.childEntries.removeElement(mEntry);
|
mEntry.parent.childEntries.removeElement(mEntry);
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import org.phoneid.keepassj2me.PwEntry;
|
|||||||
import org.phoneid.keepassj2me.PwGroup;
|
import org.phoneid.keepassj2me.PwGroup;
|
||||||
|
|
||||||
import com.keepassdroid.Database;
|
import com.keepassdroid.Database;
|
||||||
|
import com.keepassdroid.search.SearchDbHelper;
|
||||||
|
|
||||||
public class UpdateEntry extends RunnableOnFinish {
|
public class UpdateEntry extends RunnableOnFinish {
|
||||||
private Database mDb;
|
private Database mDb;
|
||||||
@@ -78,7 +79,10 @@ public class UpdateEntry extends RunnableOnFinish {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Update search index
|
// Update search index
|
||||||
mDb.searchHelper.updateEntry(mOldE);
|
SearchDbHelper helper = mDb.searchHelper;
|
||||||
|
helper.open();
|
||||||
|
helper.updateEntry(mOldE);
|
||||||
|
helper.close();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// If we fail to save, back out changes to global structure
|
// If we fail to save, back out changes to global structure
|
||||||
|
|||||||
Reference in New Issue
Block a user