mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed issues with initial commit

Browse source
This commit is contained in:
pasdam 2018-03-23 11:18:06 +01:00 • committed by Jonathan White
parent ad4423d226
commit b4d806ad41
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
17 changed files with 43 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/browser/BrowserService.cpp
View file

@ -17,6 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QJsonArray>
#include <QInputDialog>
#include <QProgressDialog>
#include <QMessageBox>
#include <QUuid>
#include "BrowserService.h"
#include "BrowserAccessControlDialog.h"
#include "BrowserEntryConfig.h"
@ -26,19 +32,9 @@
#include "core/Group.h"
#include "core/Metadata.h"
#include "core/PasswordGenerator.h"
#include "core/Uuid.h"
#include "gui/MainWindow.h"
#include <QInputDialog>
#include <QJsonArray>
#include <QMessageBox>
#include <QProgressDialog>
// de887cc3-0363-43b8-974b-5911b8816224
static const unsigned char KEEPASSXCBROWSER_UUID_DATA[] =
{0xde, 0x88, 0x7c, 0xc3, 0x03, 0x63, 0x43, 0xb8, 0x97, 0x4b, 0x59, 0x11, 0xb8, 0x81, 0x62, 0x24};
static const Uuid KEEPASSXCBROWSER_UUID =
Uuid(QByteArray::fromRawData(reinterpret_cast<const char*>(KEEPASSXCBROWSER_UUID_DATA),
sizeof(KEEPASSXCBROWSER_UUID_DATA)));
static const QUuid KEEPASSXCBROWSER_UUID = QUuid::fromRfc4122(QByteArray::fromHex("de887cc3036343b8974b5911b8816224"));
static const char KEEPASSXCBROWSER_NAME[] = "KeePassXC-Browser Settings";
static const char ASSOCIATE_KEY_PREFIX[] = "Public Key: ";
static const char KEEPASSXCBROWSER_GROUP_NAME[] = "KeePassXC-Browser Passwords";
@ -118,7 +114,7 @@ QString BrowserService::getDatabaseRootUuid()
return QString();
}
return rootGroup->uuid().toHex();
return QString::fromLatin1(rootGroup->uuid().toRfc4122().toHex());
}
QString BrowserService::getDatabaseRecycleBinUuid()
@ -132,7 +128,7 @@ QString BrowserService::getDatabaseRecycleBinUuid()
if (!recycleBin) {
return QString();
}
return recycleBin->uuid().toHex();
return QString::fromLatin1(recycleBin->uuid().toRfc4122().toHex());
}
Entry* BrowserService::getConfigEntry(bool create)
@ -306,7 +302,7 @@ void BrowserService::addEntry(const QString&,
}
Entry* entry = new Entry();
entry->setUuid(Uuid::random());
entry->setUuid(QUuid::createUuid());
entry->setTitle(QUrl(url).host());
entry->setUrl(url);
entry->setIcon(KEEPASSXCBROWSER_DEFAULT_ICON);
@ -350,7 +346,7 @@ void BrowserService::updateEntry(const QString& id,
return;
}
Entry* entry = db->resolveEntry(Uuid::fromHex(uuid));
Entry* entry = db->resolveEntry(QUuid::fromRfc4122(QByteArray::fromHex(uuid.toLatin1())));
if (!entry) {
return;
}
@ -631,7 +627,7 @@ QJsonObject BrowserService::prepareEntry(const Entry* entry)
res["login"] = entry->resolveMultiplePlaceholders(entry->username());
res["password"] = entry->resolveMultiplePlaceholders(entry->password());
res["name"] = entry->resolveMultiplePlaceholders(entry->title());
res["uuid"] = entry->resolveMultiplePlaceholders(entry->uuid().toHex());
res["uuid"] = entry->resolveMultiplePlaceholders(QString::fromLatin1(entry->uuid().toRfc4122().toHex()));
if (entry->hasTotp()) {
res["totp"] = entry->totp();
@ -693,7 +689,7 @@ Group* BrowserService::findCreateAddEntryGroup()
}
Group* group = new Group();
group->setUuid(Uuid::random());
group->setUuid(QUuid::createUuid());
group->setName(groupName);
group->setIcon(KEEPASSXCBROWSER_DEFAULT_ICON);
group->setParent(rootGroup);