From aa29aec40fa56ccbc2569e7c787f97e18af6aed9 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 26 Jul 2018 14:08:48 +0200 Subject: [PATCH] Add search suggestions --- .../keepass/tests/database/DeleteEntry.java | 6 +- .../keepass/tests/database/EntryV4.java | 6 +- .../keepass/activities/EntryActivity.java | 4 +- .../keepass/activities/EntryEditActivity.java | 4 +- .../keepass/activities/GroupActivity.java | 19 +++ .../adapters/SearchEntryCursorAdapter.java | 127 ++++++++++++++++++ .../kunzisoft/keepass/database/Database.java | 58 +++++++- .../kunzisoft/keepass/database/PwEntry.java | 2 +- .../kunzisoft/keepass/database/PwEntryV4.java | 24 +--- .../kunzisoft/keepass/database/PwGroupV4.java | 2 +- .../kunzisoft/keepass/database/PwIcon.java | 2 + .../keepass/database/PwIconCustom.java | 21 ++- .../keepass/database/PwIconFactory.java | 23 +--- .../keepass/database/PwIconStandard.java | 16 ++- .../kunzisoft/keepass/database/PwNode.java | 2 +- .../keepass/database/cursor/EntryCursor.java | 81 +++++++++++ .../iterator/EntrySearchStringIterator.java | 4 +- .../iterator/EntrySearchStringIteratorV3.java | 2 +- .../iterator/EntrySearchStringIteratorV4.java | 27 ++-- .../keepass/database/save/PwDbV4Output.java | 12 +- .../database/save/PwEntryOutputV3.java | 2 +- .../database/save/PwGroupOutputV3.java | 2 +- .../{ => search}/EntrySearchHandler.java | 4 +- .../{ => search}/EntrySearchHandlerAll.java | 5 +- .../{ => search}/EntrySearchHandlerV4.java | 5 +- .../database/{ => search}/EntrySearchV4.java | 5 +- .../{ => database}/search/SearchDbHelper.java | 14 +- .../{ => search}/SearchParameters.java | 2 +- .../{ => search}/SearchParametersV4.java | 2 +- .../keepass/icons/IconDrawableFactory.java | 10 +- .../kunzisoft/keepass/utils/SprEngineV4.java | 7 +- app/src/main/res/layout/list_nodes_entry.xml | 1 + app/src/main/res/layout/search_entry.xml | 51 +++++++ 33 files changed, 450 insertions(+), 102 deletions(-) create mode 100644 app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.java create mode 100644 app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.java rename app/src/main/java/com/kunzisoft/keepass/database/{ => search}/EntrySearchHandler.java (92%) rename app/src/main/java/com/kunzisoft/keepass/database/{ => search}/EntrySearchHandlerAll.java (90%) rename app/src/main/java/com/kunzisoft/keepass/database/{ => search}/EntrySearchHandlerV4.java (92%) rename app/src/main/java/com/kunzisoft/keepass/database/{ => search}/EntrySearchV4.java (94%) rename app/src/main/java/com/kunzisoft/keepass/{ => database}/search/SearchDbHelper.java (93%) rename app/src/main/java/com/kunzisoft/keepass/database/{ => search}/SearchParameters.java (97%) rename app/src/main/java/com/kunzisoft/keepass/database/{ => search}/SearchParametersV4.java (96%) create mode 100644 app/src/main/res/layout/search_entry.xml diff --git a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java index 15f06fdb0..88597ae20 100644 --- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java @@ -29,7 +29,7 @@ import com.kunzisoft.keepass.database.PwEntry; import com.kunzisoft.keepass.database.PwEntryV3; import com.kunzisoft.keepass.database.PwGroup; import com.kunzisoft.keepass.database.action.node.DeleteGroupRunnable; -import com.kunzisoft.keepass.search.SearchDbHelper; +import com.kunzisoft.keepass.database.search.SearchDbHelper; import java.util.List; @@ -72,8 +72,8 @@ public class DeleteEntry extends AndroidTestCase { // Verify the entries were removed from the search index SearchDbHelper dbHelp = new SearchDbHelper(ctx); - PwGroup results1 = dbHelp.search(db.getPwDatabase(), ENTRY1_NAME); - PwGroup results2 = dbHelp.search(db.getPwDatabase(), ENTRY2_NAME); + PwGroup results1 = dbHelp.search(db.getPwDatabase(), ENTRY1_NAME, 100); + PwGroup results2 = dbHelp.search(db.getPwDatabase(), ENTRY2_NAME, 100); assertEquals("Entry1 was not removed from the search results", 0, results1.numbersOfChildEntries()); assertEquals("Entry2 was not removed from the search results", 0, results2.numbersOfChildEntries()); diff --git a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java index c4a7f4cea..b20fa9b32 100644 --- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java +++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java @@ -19,11 +19,11 @@ */ package com.kunzisoft.keepass.tests.database; -import junit.framework.TestCase; - import com.kunzisoft.keepass.database.PwDatabaseV4; import com.kunzisoft.keepass.database.PwEntryV4; +import junit.framework.TestCase; + public class EntryV4 extends TestCase { public void testBackup() { @@ -46,7 +46,7 @@ public class EntryV4 extends TestCase { entry.createBackup(db); PwEntryV4 backup = entry.getHistory().get(0); - entry.endToManageFieldReferences(); + entry.stopToManageFieldReferences(); assertEquals("Title2", backup.getTitle()); assertEquals("User2", backup.getUsername()); } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java index ebb6a7ff2..b992ab77a 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java @@ -225,7 +225,7 @@ public class EntryActivity extends LockingHideActivity { startService(intent); } - mEntry.endToManageFieldReferences(); + mEntry.stopToManageFieldReferences(); } firstLaunchOfActivity = false; } @@ -369,7 +369,7 @@ public class EntryActivity extends LockingHideActivity { entryContentsView.assignExpiresDate(getString(R.string.never)); } - mEntry.endToManageFieldReferences(); + mEntry.stopToManageFieldReferences(); } @Override diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java index 08a8512b8..d470c2685 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java @@ -429,7 +429,7 @@ public class EntryEditActivity extends LockingHideActivity } } - newEntry.endToManageFieldReferences(); + newEntry.stopToManageFieldReferences(); return newEntry; } @@ -484,7 +484,7 @@ public class EntryEditActivity extends LockingHideActivity } // Don't start the field reference manager, we want to see the raw ref - mEntry.endToManageFieldReferences(); + mEntry.stopToManageFieldReferences(); entryTitleView.setText(mEntry.getTitle()); entryUserNameView.setText(mEntry.getUsername()); diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java index ade0b7341..2f54bb21b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java @@ -53,6 +53,7 @@ import com.getkeepsafe.taptargetview.TapTarget; import com.getkeepsafe.taptargetview.TapTargetView; import com.kunzisoft.keepass.R; import com.kunzisoft.keepass.adapters.NodeAdapter; +import com.kunzisoft.keepass.adapters.SearchEntryCursorAdapter; import com.kunzisoft.keepass.app.App; import com.kunzisoft.keepass.autofill.AutofillHelper; import com.kunzisoft.keepass.database.Database; @@ -131,6 +132,8 @@ public class GroupActivity extends LockingActivity private boolean entrySelectionMode; private AutofillHelper autofillHelper; + private SearchEntryCursorAdapter searchSuggestionAdapter; + // After a database creation public static void launch(Activity act) { launch(act, READ_ONLY_DEFAULT); @@ -288,6 +291,9 @@ public class GroupActivity extends LockingActivity autofillHelper.retrieveAssistStructure(getIntent()); } + // Search suggestion + searchSuggestionAdapter = new SearchEntryCursorAdapter(this, database); + Log.i(TAG, "Finished creating tree"); } @@ -845,6 +851,19 @@ public class GroupActivity extends LockingActivity if (searchView != null) { searchView.setSearchableInfo(searchManager.getSearchableInfo(new ComponentName(this, GroupActivity.class))); searchView.setIconifiedByDefault(false); // Do not iconify the widget; expand it by default + searchView.setSuggestionsAdapter(searchSuggestionAdapter); + searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() { + @Override + public boolean onSuggestionClick(int position) { + onNodeClick(searchSuggestionAdapter.getEntryFromPosition(position)); + return true; + } + + @Override + public boolean onSuggestionSelect(int position) { + return true; + } + }); } MenuUtil.contributionMenuInflater(inflater, menu); diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.java b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.java new file mode 100644 index 000000000..85f5d09ce --- /dev/null +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.java @@ -0,0 +1,127 @@ +/* + * Copyright 2018 Jeremy Jamet / Kunzisoft. + * + * This file is part of KeePass DX. + * + * KeePass DX is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * KeePass DX is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with KeePass DX. If not, see . + * + */ +package com.kunzisoft.keepass.adapters; + +import android.content.Context; +import android.content.res.TypedArray; +import android.database.Cursor; +import android.graphics.Color; +import android.support.v4.widget.CursorAdapter; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import com.kunzisoft.keepass.R; +import com.kunzisoft.keepass.database.Database; +import com.kunzisoft.keepass.database.PwEntry; +import com.kunzisoft.keepass.database.PwIcon; +import com.kunzisoft.keepass.database.PwIconFactory; +import com.kunzisoft.keepass.database.PwIconStandard; +import com.kunzisoft.keepass.database.cursor.EntryCursor; +import com.kunzisoft.keepass.icons.IconPackChooser; + +import java.util.UUID; + +public class SearchEntryCursorAdapter extends CursorAdapter { + + private LayoutInflater cursorInflater; + private Database database; + private int iconColor; + + public SearchEntryCursorAdapter(Context context, Database database) { + super(context, null, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER); + cursorInflater = (LayoutInflater) context.getSystemService( + Context.LAYOUT_INFLATER_SERVICE); + this.database = database; + + // Get the icon color + int[] attrTextColor = {R.attr.textColorInverse}; + TypedArray taTextColor = context.getTheme().obtainStyledAttributes(attrTextColor); + this.iconColor = taTextColor.getColor(0, Color.WHITE); + taTextColor.recycle(); + } + + @Override + public View newView(Context context, Cursor cursor, ViewGroup parent) { + + View view = cursorInflater.inflate(R.layout.search_entry, parent ,false); + ViewHolder viewHolder = new ViewHolder(); + viewHolder.imageViewIcon = view.findViewById(R.id.entry_icon); + viewHolder.textViewTitle = view.findViewById(R.id.entry_text); + view.setTag(viewHolder); + + return view; + } + + @Override + public void bindView(View view, Context context, Cursor cursor) { + + // Retrieve elements from cursor + PwIconFactory iconFactory = database.getPwDatabase().getIconFactory(); + PwIcon icon = iconFactory.getIcon( + new UUID(cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)), + cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS)))); + if (icon.isUnknown()) { + icon = iconFactory.getIcon(cursor.getInt(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_STANDARD))); + if (icon.isUnknown()) + icon = iconFactory.getKeyIcon(); + } + String title = cursor.getString( cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_TITLE) ); + + ViewHolder viewHolder = (ViewHolder) view.getTag(); + + // Assign image + if (IconPackChooser.getSelectedIconPack(context).tintable()) { + database.getDrawFactory().assignDatabaseIconTo(context, viewHolder.imageViewIcon, icon, true, iconColor); + } else { + database.getDrawFactory().assignDatabaseIconTo(context, viewHolder.imageViewIcon, icon); + } + // Assign title + viewHolder.textViewTitle.setText(title); + } + + private static class ViewHolder { + ImageView imageViewIcon; + TextView textViewTitle; + } + + @Override + public Cursor runQueryOnBackgroundThread(CharSequence constraint) { + return database.searchEntry(constraint.toString()); + } + + public PwEntry getEntryFromPosition(int position) { + PwEntry pwEntry = null; + + Cursor cursor = this.getCursor(); + if (cursor.moveToFirst() + && + cursor.move(position)) { + + pwEntry = database.createEntry(); + database.populateEntry(pwEntry, cursor); + + } + return pwEntry; + } + +} diff --git a/app/src/main/java/com/kunzisoft/keepass/database/Database.java b/app/src/main/java/com/kunzisoft/keepass/database/Database.java index 1f4830c52..90cd2f868 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/Database.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/Database.java @@ -21,19 +21,21 @@ package com.kunzisoft.keepass.database; import android.content.Context; import android.content.res.Resources; +import android.database.Cursor; import android.net.Uri; import android.util.Log; import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine; import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory; +import com.kunzisoft.keepass.database.cursor.EntryCursor; import com.kunzisoft.keepass.database.exception.ContentFileNotFoundException; import com.kunzisoft.keepass.database.exception.InvalidDBException; import com.kunzisoft.keepass.database.exception.PwDbOutputException; import com.kunzisoft.keepass.database.load.Importer; import com.kunzisoft.keepass.database.load.ImporterFactory; import com.kunzisoft.keepass.database.save.PwDbOutput; +import com.kunzisoft.keepass.database.search.SearchDbHelper; import com.kunzisoft.keepass.icons.IconDrawableFactory; -import com.kunzisoft.keepass.search.SearchDbHelper; import com.kunzisoft.keepass.tasks.ProgressTaskUpdater; import com.kunzisoft.keepass.utils.UriUtil; @@ -179,13 +181,17 @@ public class Database { } public PwGroup search(String str) { + return search(str, Integer.MAX_VALUE); + } + + public PwGroup search(String str, int max) { if (searchHelper == null) { return null; } try { switch (pm.getVersion()) { case V3: - return ((SearchDbHelper.SearchDbHelperV3) searchHelper).search(((PwDatabaseV3) pm), str); + return ((SearchDbHelper.SearchDbHelperV3) searchHelper).search(((PwDatabaseV3) pm), str, max); case V4: - return ((SearchDbHelper.SearchDbHelperV4) searchHelper).search(((PwDatabaseV4) pm), str); + return ((SearchDbHelper.SearchDbHelperV4) searchHelper).search(((PwDatabaseV4) pm), str, max); } } catch (Exception e) { Log.e(TAG, "Search can't be performed with this SearchHelper", e); @@ -193,6 +199,46 @@ public class Database { return null; } + public Cursor searchEntry(String query) { + final EntryCursor cursor = new EntryCursor(); + + // TODO real content provider + if (!query.isEmpty()) { + PwGroup searchResult = search(query, 6); + for (int i=0; i < searchResult.numbersOfChildEntries(); i++) { + PwEntry entry = searchResult.getChildEntryAt(i); + try { + switch (getPwDatabase().getVersion()) { + case V3: + EntryCursor.addEntry(cursor, (PwEntryV3) entry, i); + case V4: + EntryCursor.addEntry(cursor, (PwEntryV4) entry, i); + } + } catch (Exception e) { + Log.e(TAG, "This version of PwGroup can't be populated", e); + } + } + } + return cursor; + } + + public void populateEntry(PwEntry pwEntry, Cursor cursor) { + // TODO invert field reference manager + pwEntry.startToManageFieldReferences(getPwDatabase()); + PwIconFactory iconFactory = getPwDatabase().getIconFactory(); + try { + switch (getPwDatabase().getVersion()) { + case V3: + EntryCursor.populateEntry(cursor, (PwEntryV3) pwEntry, iconFactory); + case V4: + EntryCursor.populateEntry(cursor, (PwEntryV4) pwEntry, iconFactory); + } + } catch (Exception e) { + Log.e(TAG, "This version of PwGroup can't be populated", e); + } + pwEntry.stopToManageFieldReferences(); + } + public void saveData(Context ctx) throws IOException, PwDbOutputException { saveData(ctx, mUri); } @@ -464,7 +510,11 @@ public class Database { } } - public PwEntry createEntry(PwGroup parent) { + public PwEntry createEntry() { + return createEntry(null); + } + + public PwEntry createEntry(@Nullable PwGroup parent) { PwEntry newPwEntry = null; try { switch (getPwDatabase().getVersion()) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/PwEntry.java b/app/src/main/java/com/kunzisoft/keepass/database/PwEntry.java index fd25c2ec6..9df7cd154 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/PwEntry.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwEntry.java @@ -76,7 +76,7 @@ public abstract class PwEntry extends PwNode { } public void startToManageFieldReferences(PwDatabase db) {} - public void endToManageFieldReferences() {} + public void stopToManageFieldReferences() {} public abstract String getTitle(); public abstract void setTitle(String title); diff --git a/app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java b/app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java index 3b9262c3e..6170f3c5d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java @@ -169,7 +169,7 @@ public class PwEntryV4 extends PwEntry implements ITimeLogger { } @Override - public void endToManageFieldReferences() { + public void stopToManageFieldReferences() { this.mDatabase = null; this.mDecodeRef = false; } @@ -205,41 +205,31 @@ public class PwEntryV4 extends PwEntry implements ITimeLogger { @Override public void setTitle(String title) { - PwDatabaseV4 db = mDatabase; - boolean protect = db.getMemoryProtection().protectTitle; - + boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectTitle; setProtectedString(STR_TITLE, title, protect); } @Override public void setUsername(String user) { - PwDatabaseV4 db = mDatabase; - boolean protect = db.getMemoryProtection().protectUserName; - + boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectUserName; setProtectedString(STR_USERNAME, user, protect); } @Override public void setPassword(String pass) { - PwDatabaseV4 db = mDatabase; - boolean protect = db.getMemoryProtection().protectPassword; - + boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectPassword; setProtectedString(STR_PASSWORD, pass, protect); } @Override public void setUrl(String url) { - PwDatabaseV4 db = mDatabase; - boolean protect = db.getMemoryProtection().protectUrl; - + boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectUrl; setProtectedString(STR_URL, url, protect); } @Override public void setNotes(String notes) { - PwDatabaseV4 db = mDatabase; - boolean protect = db.getMemoryProtection().protectNotes; - + boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectNotes; setProtectedString(STR_NOTES, notes, protect); } @@ -287,7 +277,7 @@ public class PwEntryV4 extends PwEntry implements ITimeLogger { @Override public PwIcon getIcon() { - if (customIcon == null || customIcon.uuid.equals(PwDatabase.UUID_ZERO)) { + if (customIcon == null || customIcon.getUUID().equals(PwDatabase.UUID_ZERO)) { return super.getIcon(); } else { return customIcon; diff --git a/app/src/main/java/com/kunzisoft/keepass/database/PwGroupV4.java b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupV4.java index c65d88e8d..959a741af 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/PwGroupV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwGroupV4.java @@ -225,7 +225,7 @@ public class PwGroupV4 extends PwGroup implemen @Override public PwIcon getIcon() { - if (customIcon == null || customIcon.uuid.equals(PwDatabase.UUID_ZERO)) { + if (customIcon == null || customIcon.getUUID().equals(PwDatabase.UUID_ZERO)) { return super.getIcon(); } else { return customIcon; diff --git a/app/src/main/java/com/kunzisoft/keepass/database/PwIcon.java b/app/src/main/java/com/kunzisoft/keepass/database/PwIcon.java index bd8f37a6b..db23e3425 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/PwIcon.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwIcon.java @@ -32,6 +32,8 @@ public abstract class PwIcon implements Parcelable { protected PwIcon(Parcel in) {} + public abstract boolean isUnknown(); + @Override public int describeContents() { return 0; diff --git a/app/src/main/java/com/kunzisoft/keepass/database/PwIconCustom.java b/app/src/main/java/com/kunzisoft/keepass/database/PwIconCustom.java index 7299037d3..a1d9c132b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/PwIconCustom.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwIconCustom.java @@ -26,8 +26,8 @@ import java.util.UUID; public class PwIconCustom extends PwIcon { public static final PwIconCustom ZERO = new PwIconCustom(PwDatabase.UUID_ZERO, new byte[0]); - public final UUID uuid; - public byte[] imageData; + private final UUID uuid; + private byte[] imageData; public PwIconCustom(UUID uuid, byte[] data) { super(); @@ -48,6 +48,23 @@ public class PwIconCustom extends PwIcon { } @Override + public boolean isUnknown() { + return uuid == null || this.equals(ZERO); + } + + public UUID getUUID() { + return uuid; + } + + public byte[] getImageData() { + return imageData; + } + + public void setImageData(byte[] imageData) { + this.imageData = imageData; + } + + @Override public void writeToParcel(Parcel dest, int flags) { dest.writeSerializable(uuid); dest.writeByteArray(imageData); diff --git a/app/src/main/java/com/kunzisoft/keepass/database/PwIconFactory.java b/app/src/main/java/com/kunzisoft/keepass/database/PwIconFactory.java index 480ac531c..740341ea8 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/PwIconFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwIconFactory.java @@ -46,8 +46,8 @@ public class PwIconFactory { } public PwIconStandard getFolderIcon() { - return getIcon(PwIconStandard.FOLDER); - } + return getIcon(PwIconStandard.FOLDER); + } public PwIconStandard getIcon(int iconId) { PwIconStandard icon = (PwIconStandard) cache.get(iconId); @@ -71,25 +71,8 @@ public class PwIconFactory { return icon; } - public PwIconCustom getIcon(UUID iconUuid, byte[] data) { - PwIconCustom icon = (PwIconCustom) customCache.get(iconUuid); - - if (icon == null) { - icon = new PwIconCustom(iconUuid, data); - customCache.put(iconUuid, icon); - } else { - icon.imageData = data; - } - - return icon; - } - - public void setIconData(UUID iconUuid, byte[] data) { - getIcon(iconUuid, data); - } - public void put(PwIconCustom icon) { - customCache.put(icon.uuid, icon); + customCache.put(icon.getUUID(), icon); } } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/PwIconStandard.java b/app/src/main/java/com/kunzisoft/keepass/database/PwIconStandard.java index 961eff1bb..f0c73e0f9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/PwIconStandard.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwIconStandard.java @@ -22,12 +22,17 @@ package com.kunzisoft.keepass.database; import android.os.Parcel; public class PwIconStandard extends PwIcon { - public final int iconId; + private final int iconId; + public static final int UNKNOWN = -1; public static final int KEY = 0; public static final int TRASH = 43; public static final int FOLDER = 48; + public PwIconStandard() { + this.iconId = KEY; + } + public PwIconStandard(int iconId) { this.iconId = iconId; } @@ -42,6 +47,15 @@ public class PwIconStandard extends PwIcon { } @Override + public boolean isUnknown() { + return iconId == UNKNOWN; + } + + public int getIconId() { + return iconId; + } + + @Override public void writeToParcel(Parcel dest, int flags) { dest.writeInt(iconId); } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/PwNode.java b/app/src/main/java/com/kunzisoft/keepass/database/PwNode.java index 5080afcc1..db426bad3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/PwNode.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwNode.java @@ -33,7 +33,7 @@ import org.joda.time.LocalDate; public abstract class PwNode implements ISmallTimeLogger, Parcelable, Cloneable { protected Parent parent = null; - protected PwIconStandard icon = new PwIconStandard(0); + protected PwIconStandard icon = new PwIconStandard(); protected PwDate creation = new PwDate(); protected PwDate lastMod = new PwDate(); protected PwDate lastAccess = new PwDate(); diff --git a/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.java b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.java new file mode 100644 index 000000000..cddbb0b41 --- /dev/null +++ b/app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.java @@ -0,0 +1,81 @@ +package com.kunzisoft.keepass.database.cursor; + +import android.database.Cursor; +import android.database.MatrixCursor; +import android.provider.BaseColumns; +import android.util.Log; + +import com.kunzisoft.keepass.database.PwDatabase; +import com.kunzisoft.keepass.database.PwEntry; +import com.kunzisoft.keepass.database.PwEntryV3; +import com.kunzisoft.keepass.database.PwEntryV4; +import com.kunzisoft.keepass.database.PwIconCustom; +import com.kunzisoft.keepass.database.PwIconFactory; +import com.kunzisoft.keepass.database.PwIconStandard; + +import java.util.UUID; + +public class EntryCursor extends MatrixCursor { + + public static final String _ID = BaseColumns._ID; + public static final String COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS = "UUIDMostSignificantBits"; + public static final String COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS = "UUIDLeastSignificantBits"; + public static final String COLUMN_INDEX_TITLE = "title"; + public static final String COLUMN_INDEX_ICON_STANDARD = "iconStandard"; + public static final String COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS = "iconCustomUUIDMostSignificantBits"; + public static final String COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS = "iconCustomUUIDLeastSignificantBits"; + + public EntryCursor() { + super(new String[]{ _ID, + COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS, + COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS, + COLUMN_INDEX_TITLE, + COLUMN_INDEX_ICON_STANDARD, + COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS, + COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS}); + } + + public static void addEntry(MatrixCursor cursor, PwEntryV3 entry, int id) { + cursor.addRow(new Object[] {id, + entry.getUUID().getMostSignificantBits(), + entry.getUUID().getLeastSignificantBits(), + entry.getTitle(), + entry.getIconStandard().getIconId(), + PwDatabase.UUID_ZERO.getMostSignificantBits(), + PwDatabase.UUID_ZERO.getLeastSignificantBits()}); + } + + public static void addEntry(MatrixCursor cursor, PwEntryV4 entry, int id) { + cursor.addRow(new Object[] {id, + entry.getUUID().getMostSignificantBits(), + entry.getUUID().getLeastSignificantBits(), + entry.getTitle(), + entry.getIconStandard().getIconId(), + entry.getCustomIcon().getUUID().getMostSignificantBits(), + entry.getCustomIcon().getUUID().getLeastSignificantBits()}); + } + + private static void populateEntryBaseVersion(Cursor cursor, PwEntry pwEntry, PwIconFactory iconFactory) { + pwEntry.setUUID( + new UUID(cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS)), + cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS)))); + pwEntry.setTitle(cursor.getString(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_TITLE))); + + PwIconStandard iconStandard = iconFactory.getIcon(cursor.getInt(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_STANDARD))); + pwEntry.setIcon(iconStandard); + } + + public static void populateEntry(Cursor cursor, PwEntryV3 pwEntry, PwIconFactory iconFactory) { + populateEntryBaseVersion(cursor, pwEntry, iconFactory); + } + + public static void populateEntry(Cursor cursor, PwEntryV4 pwEntry, PwIconFactory iconFactory) { + populateEntryBaseVersion(cursor, pwEntry, iconFactory); + + PwIconCustom iconCustom = iconFactory.getIcon( + new UUID(cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)), + cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS)))); + pwEntry.setCustomIcon(iconCustom); + } + +} diff --git a/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIterator.java b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIterator.java index 36ae095a4..da3c675ff 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIterator.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIterator.java @@ -22,8 +22,8 @@ package com.kunzisoft.keepass.database.iterator; import com.kunzisoft.keepass.database.PwEntry; import com.kunzisoft.keepass.database.PwEntryV3; import com.kunzisoft.keepass.database.PwEntryV4; -import com.kunzisoft.keepass.database.SearchParameters; -import com.kunzisoft.keepass.database.SearchParametersV4; +import com.kunzisoft.keepass.database.search.SearchParameters; +import com.kunzisoft.keepass.database.search.SearchParametersV4; import java.util.Iterator; diff --git a/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java index 9a690ce20..b6d6dbc8d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java @@ -20,7 +20,7 @@ package com.kunzisoft.keepass.database.iterator; import com.kunzisoft.keepass.database.PwEntryV3; -import com.kunzisoft.keepass.database.SearchParameters; +import com.kunzisoft.keepass.database.search.SearchParameters; import java.util.NoSuchElementException; diff --git a/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV4.java b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV4.java index a73e69dc8..3e08817a4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV4.java @@ -20,7 +20,7 @@ package com.kunzisoft.keepass.database.iterator; import com.kunzisoft.keepass.database.PwEntryV4; -import com.kunzisoft.keepass.database.SearchParametersV4; +import com.kunzisoft.keepass.database.search.SearchParametersV4; import com.kunzisoft.keepass.database.security.ProtectedString; import java.util.Iterator; @@ -78,18 +78,19 @@ public class EntrySearchStringIteratorV4 extends EntrySearchStringIterator { } private boolean searchInField(String key) { - if (key.equals(PwEntryV4.STR_TITLE)) { - return sp.searchInTitles; - } else if (key.equals(PwEntryV4.STR_USERNAME)) { - return sp.searchInUserNames; - } else if (key.equals(PwEntryV4.STR_PASSWORD)) { - return sp.searchInPasswords; - } else if (key.equals(PwEntryV4.STR_URL)) { - return sp.searchInUrls; - } else if (key.equals(PwEntryV4.STR_NOTES)) { - return sp.searchInNotes; - } else { - return sp.searchInOther; + switch (key) { + case PwEntryV4.STR_TITLE: + return sp.searchInTitles; + case PwEntryV4.STR_USERNAME: + return sp.searchInUserNames; + case PwEntryV4.STR_PASSWORD: + return sp.searchInPasswords; + case PwEntryV4.STR_URL: + return sp.searchInUrls; + case PwEntryV4.STR_NOTES: + return sp.searchInNotes; + default: + return sp.searchInOther; } } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java index 194dbf4cd..214af00b6 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java @@ -350,10 +350,10 @@ public class PwDbV4Output extends PwDbOutput { writeObject(PwDatabaseV4XML.ElemUuid, group.getUUID()); writeObject(PwDatabaseV4XML.ElemName, group.getName()); writeObject(PwDatabaseV4XML.ElemNotes, group.getNotes()); - writeObject(PwDatabaseV4XML.ElemIcon, group.getIconStandard().iconId); + writeObject(PwDatabaseV4XML.ElemIcon, group.getIconStandard().getIconId()); if (!group.getCustomIcon().equals(PwIconCustom.ZERO)) { - writeObject(PwDatabaseV4XML.ElemCustomIconID, group.getCustomIcon().uuid); + writeObject(PwDatabaseV4XML.ElemCustomIconID, group.getCustomIcon().getUUID()); } writeList(PwDatabaseV4XML.ElemTimes, group); @@ -375,10 +375,10 @@ public class PwDbV4Output extends PwDbOutput { xml.startTag(null, PwDatabaseV4XML.ElemEntry); writeObject(PwDatabaseV4XML.ElemUuid, entry.getUUID()); - writeObject(PwDatabaseV4XML.ElemIcon, entry.getIconStandard().iconId); + writeObject(PwDatabaseV4XML.ElemIcon, entry.getIconStandard().getIconId()); if (!entry.getCustomIcon().equals(PwIconCustom.ZERO)) { - writeObject(PwDatabaseV4XML.ElemCustomIconID, entry.getCustomIcon().uuid); + writeObject(PwDatabaseV4XML.ElemCustomIconID, entry.getCustomIcon().getUUID()); } writeObject(PwDatabaseV4XML.ElemFgColor, entry.getForegroundColor()); @@ -701,8 +701,8 @@ public class PwDbV4Output extends PwDbOutput { for (PwIconCustom icon : customIcons) { xml.startTag(null, PwDatabaseV4XML.ElemCustomIconItem); - writeObject(PwDatabaseV4XML.ElemCustomIconItemID, icon.uuid); - writeObject(PwDatabaseV4XML.ElemCustomIconItemData, String.valueOf(Base64Coder.encode(icon.imageData))); + writeObject(PwDatabaseV4XML.ElemCustomIconItemID, icon.getUUID()); + writeObject(PwDatabaseV4XML.ElemCustomIconItemData, String.valueOf(Base64Coder.encode(icon.getImageData()))); xml.endTag(null, PwDatabaseV4XML.ElemCustomIconItem); } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/save/PwEntryOutputV3.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwEntryOutputV3.java index 2a640e843..c9ba3feda 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/save/PwEntryOutputV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwEntryOutputV3.java @@ -84,7 +84,7 @@ public class PwEntryOutputV3 { // Image ID mOS.write(IMAGEID_FIELD_TYPE); mOS.write(LONG_FOUR); - mOS.write(LEDataOutputStream.writeIntBuf(mPE.getIconStandard().iconId)); + mOS.write(LEDataOutputStream.writeIntBuf(mPE.getIconStandard().getIconId())); // Title //byte[] title = mPE.title.getBytes("UTF-8"); diff --git a/app/src/main/java/com/kunzisoft/keepass/database/save/PwGroupOutputV3.java b/app/src/main/java/com/kunzisoft/keepass/database/save/PwGroupOutputV3.java index 74dbff568..9af15826a 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/save/PwGroupOutputV3.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/save/PwGroupOutputV3.java @@ -93,7 +93,7 @@ public class PwGroupOutputV3 { // Image ID mOS.write(IMAGEID_FIELD_TYPE); mOS.write(IMAGEID_FIELD_SIZE); - mOS.write(LEDataOutputStream.writeIntBuf(mPG.getIconStandard().iconId)); + mOS.write(LEDataOutputStream.writeIntBuf(mPG.getIconStandard().getIconId())); // Level mOS.write(LEVEL_FIELD_TYPE); diff --git a/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandler.java b/app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandler.java similarity index 92% rename from app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandler.java rename to app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandler.java index 24bed9df9..99753a8e2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandler.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandler.java @@ -17,8 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.kunzisoft.keepass.database; +package com.kunzisoft.keepass.database.search; +import com.kunzisoft.keepass.database.EntryHandler; +import com.kunzisoft.keepass.database.PwEntry; import com.kunzisoft.keepass.database.iterator.EntrySearchStringIterator; import java.util.Date; diff --git a/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerAll.java b/app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandlerAll.java similarity index 90% rename from app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerAll.java rename to app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandlerAll.java index 87e5f175d..256bd7d53 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerAll.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandlerAll.java @@ -17,7 +17,10 @@ * along with KeePass DX. If not, see . * */ -package com.kunzisoft.keepass.database; +package com.kunzisoft.keepass.database.search; + +import com.kunzisoft.keepass.database.EntryHandler; +import com.kunzisoft.keepass.database.PwEntry; import java.util.Date; import java.util.List; diff --git a/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerV4.java b/app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandlerV4.java similarity index 92% rename from app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandlerV4.java index b6dd0a1ce..57deea143 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchHandlerV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchHandlerV4.java @@ -17,8 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.kunzisoft.keepass.database; +package com.kunzisoft.keepass.database.search; +import com.kunzisoft.keepass.database.PwEntry; +import com.kunzisoft.keepass.database.PwEntryV4; +import com.kunzisoft.keepass.database.PwGroup; import com.kunzisoft.keepass.utils.StrUtil; import com.kunzisoft.keepass.utils.UuidUtil; diff --git a/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchV4.java b/app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchV4.java similarity index 94% rename from app/src/main/java/com/kunzisoft/keepass/database/EntrySearchV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchV4.java index 50520f01f..1faa70801 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/EntrySearchV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/search/EntrySearchV4.java @@ -17,8 +17,11 @@ * along with KeePass DX. If not, see . * */ -package com.kunzisoft.keepass.database; +package com.kunzisoft.keepass.database.search; +import com.kunzisoft.keepass.database.EntryHandler; +import com.kunzisoft.keepass.database.PwEntryV4; +import com.kunzisoft.keepass.database.PwGroupV4; import com.kunzisoft.keepass.utils.StrUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/kunzisoft/keepass/search/SearchDbHelper.java b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchDbHelper.java similarity index 93% rename from app/src/main/java/com/kunzisoft/keepass/search/SearchDbHelper.java rename to app/src/main/java/com/kunzisoft/keepass/database/search/SearchDbHelper.java index 5cd4b7352..fd4a7a989 100644 --- a/app/src/main/java/com/kunzisoft/keepass/search/SearchDbHelper.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchDbHelper.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.kunzisoft.keepass.search; +package com.kunzisoft.keepass.database.search; import android.content.Context; import android.content.SharedPreferences; @@ -54,10 +54,9 @@ public class SearchDbHelper worklist = new LinkedList<>(); if (pm.getRootGroup() != null) { worklist.add(pm.getRootGroup()); } - + while (worklist.size() != 0) { PwGroupSearch top = worklist.remove(); if (pm.isGroupSearchable(top, isOmitBackup)) { for (PwEntrySearch entry : top.getChildEntries()) { processEntries(entry, group.getChildEntries(), qStr, loc); + if (group.numbersOfChildEntries() >= max) + return group; } for (PwGroupSearch childGroup : top.getChildGroups()) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/SearchParameters.java b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchParameters.java similarity index 97% rename from app/src/main/java/com/kunzisoft/keepass/database/SearchParameters.java rename to app/src/main/java/com/kunzisoft/keepass/database/search/SearchParameters.java index af87198bf..6b671d754 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/SearchParameters.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchParameters.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.kunzisoft.keepass.database; +package com.kunzisoft.keepass.database.search; /** * @author bpellin diff --git a/app/src/main/java/com/kunzisoft/keepass/database/SearchParametersV4.java b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchParametersV4.java similarity index 96% rename from app/src/main/java/com/kunzisoft/keepass/database/SearchParametersV4.java rename to app/src/main/java/com/kunzisoft/keepass/database/search/SearchParametersV4.java index f02c251b7..b53324a0d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/SearchParametersV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchParametersV4.java @@ -17,7 +17,7 @@ * along with KeePass DX. If not, see . * */ -package com.kunzisoft.keepass.database; +package com.kunzisoft.keepass.database.search; public class SearchParametersV4 extends SearchParameters implements Cloneable { public static SearchParametersV4 DEFAULT = new SearchParametersV4(); diff --git a/app/src/main/java/com/kunzisoft/keepass/icons/IconDrawableFactory.java b/app/src/main/java/com/kunzisoft/keepass/icons/IconDrawableFactory.java index bc192f9c8..aacccf67f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/icons/IconDrawableFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/icons/IconDrawableFactory.java @@ -221,7 +221,7 @@ public class IconDrawableFactory { * @return The drawable */ private Drawable getIconDrawable(Context context, PwIconStandard icon, boolean isTint, int tintColor) { - int resId = IconPackChooser.getSelectedIconPack(context).iconToResId(icon.iconId); + int resId = IconPackChooser.getSelectedIconPack(context).iconToResId(icon.getIconId()); return getIconDrawable(context, resId, isTint, tintColor); } @@ -289,14 +289,14 @@ public class IconDrawableFactory { return blank; } - Drawable draw = (Drawable) customIconMap.get(icon.uuid); + Drawable draw = (Drawable) customIconMap.get(icon.getUUID()); if (draw == null) { - if (icon.imageData == null) { + if (icon.getImageData() == null) { return blank; } - Bitmap bitmap = BitmapFactory.decodeByteArray(icon.imageData, 0, icon.imageData.length); + Bitmap bitmap = BitmapFactory.decodeByteArray(icon.getImageData(), 0, icon.getImageData().length); // Could not understand custom icon if (bitmap == null) { @@ -306,7 +306,7 @@ public class IconDrawableFactory { bitmap = resize(bitmap); draw = new BitmapDrawable(context.getResources(), bitmap); - customIconMap.put(icon.uuid, draw); + customIconMap.put(icon.getUUID(), draw); } return draw; diff --git a/app/src/main/java/com/kunzisoft/keepass/utils/SprEngineV4.java b/app/src/main/java/com/kunzisoft/keepass/utils/SprEngineV4.java index 451018fb4..e80fe7f7e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/utils/SprEngineV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/utils/SprEngineV4.java @@ -19,13 +19,12 @@ */ package com.kunzisoft.keepass.utils; -import com.kunzisoft.keepass.database.EntrySearchV4; import com.kunzisoft.keepass.database.PwDatabase; import com.kunzisoft.keepass.database.PwDatabaseV4; import com.kunzisoft.keepass.database.PwEntry; import com.kunzisoft.keepass.database.PwEntryV4; -import com.kunzisoft.keepass.database.PwGroupV4; -import com.kunzisoft.keepass.database.SearchParametersV4; +import com.kunzisoft.keepass.database.search.EntrySearchV4; +import com.kunzisoft.keepass.database.search.SearchParametersV4; import java.util.ArrayList; import java.util.List; @@ -158,7 +157,7 @@ public class SprEngineV4 { List list = new ArrayList<>(); // TODO type parameter - EntrySearchV4 entrySearchV4 = new EntrySearchV4((PwGroupV4) ctx.db.getRootGroup()); + EntrySearchV4 entrySearchV4 = new EntrySearchV4(ctx.db.getRootGroup()); entrySearchV4.searchEntries(sp, list); if (list.size() > 0) { diff --git a/app/src/main/res/layout/list_nodes_entry.xml b/app/src/main/res/layout/list_nodes_entry.xml index df0724957..4dc1d2c06 100644 --- a/app/src/main/res/layout/list_nodes_entry.xml +++ b/app/src/main/res/layout/list_nodes_entry.xml @@ -40,6 +40,7 @@ android:id="@+id/entry_text" android:layout_height="wrap_content" android:layout_width="wrap_content" + android:lines="1" style="@style/KeepassDXStyle.TextAppearance.Default" android:layout_centerVertical="true" android:layout_alignParentRight="true" diff --git a/app/src/main/res/layout/search_entry.xml b/app/src/main/res/layout/search_entry.xml new file mode 100644 index 000000000..db60ac2e9 --- /dev/null +++ b/app/src/main/res/layout/search_entry.xml @@ -0,0 +1,51 @@ + + + + + + \ No newline at end of file