Correct multiple issues with custom icons #994
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
louib
reviewed
Sep 26, 2017
src/core/Metadata.cpp
Outdated
| // Remove hash record only if this is the same uuid | ||
| QByteArray hash = hashImage(m_customIcons[uuid]); | ||
| if (m_customIconsHashes.contains(hash) && m_customIconsHashes[hash] == uuid) | ||
| m_customIconsHashes.remove(hash); |
There was a problem hiding this comment.
Noted. And corrected.
droidmonkey
force-pushed
the
hotfix/unique-icons
branch
from
8b17132 to
9cbdae9
Compare
TheZ3ro
approved these changes
Sep 28, 2017
TheZ3ro
suggested changes
Sep 28, 2017
src/gui/EditWidgetIcons.cpp
Outdated
| if (uuid.isNull()) { | ||
| uuid = Uuid::random(); | ||
| // Don't add an icon larger than 128x128, but retain original size if smaller | ||
| if (icon.width() > 128 || icon.height() > 128) |
droidmonkey
force-pushed
the
hotfix/unique-icons
branch
from
9cbdae9 to
29a9275
Compare
TheZ3ro
approved these changes
Sep 29, 2017
droidmonkey
added a commit
that referenced
this pull request
Oct 1, 2017
- Corrected multiple snap issues [#934, #1011] - Corrected multiple custom icon issues [#708, #719, #994] - Corrected multiple Yubikey issues [#880] - Fixed single instance preventing load on occasion [#997] - Keep entry history when merging databases [#970] - Prevent data loss if passwords were mismatched [#1007] - Fixed crash after merge [#941] - Added configurable auto-type default delay [#703] - Unlock database dialog window comes to front [#663] - Translation and compiling fixes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Provides multiple fixes to reported bugs against custom icon loading.
The way I implemented the unique icon hashing ensures that existing databases with multiple unique icons already are not impacted.
How has this been tested?
Manually with several websites.
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]