qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://git01.codeplex.com/forks/alexvallat/keepass2androidperfopt into AlexVallat/Keepass2AndroidPerfOpt

Browse Source
This commit is contained in:
Philipp Crocoll
2013-07-09 10:13:26 +02:00
parent 84aeb31fd0 0b1f372a02
commit d90407fd2d
21 changed files with 652 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Kp2aBusinessLogic/SearchDbHelper.cs
View File

@@ -15,8 +15,9 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
*/
using System;
using KeePassLib;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using KeePassLib;
using KeePassLib.Collections;
using KeePassLib.Interfaces;
using KeePassLib.Utility;
@@ -40,9 +41,9 @@ namespace keepass2android
{
SearchParameters sp = new SearchParameters {SearchString = str};
return Search(database, sp);
return Search(database, sp, null);
}
public PwGroup Search(Database database, SearchParameters sp)
public PwGroup Search(Database database, SearchParameters sp, IDictionary<PwUuid, String> resultContexts)
{
if(sp.RegularExpression) // Validate regular expression
@@ -56,7 +57,7 @@ namespace keepass2android
PwObjectList<PwEntry> listResults = pgResults.Entries;
database.Root.SearchEntries(sp, listResults, new NullStatusLogger());
database.Root.SearchEntries(sp, listResults, resultContexts, new NullStatusLogger());
return pgResults;

4
src/Kp2aBusinessLogic/database/Database.cs
View File

@@ -160,9 +160,9 @@ namespace keepass2android
}
public PwGroup Search(SearchParameters searchParams)
public PwGroup Search(SearchParameters searchParams, IDictionary<PwUuid, String> resultContexts)
{
return SearchHelper.Search(this, searchParams);
return SearchHelper.Search(this, searchParams, resultContexts);
}