Skip to content

Commit

Permalink
Use correct settings keys and minor cleanups
Browse files Browse the repository at this point in the history
IB-7884

Signed-off-by: Raul Metsma <raul@metsma.ee>
  • Loading branch information
metsma committed Feb 26, 2024
1 parent d6c7bfe commit 96fd63f
Showing 4 changed files with 5 additions and 19 deletions.
4 changes: 2 additions & 2 deletions client/CDoc2.cpp
Original file line number Diff line number Diff line change
@@ -563,7 +563,7 @@ bool CDoc2::save(const QString &path)
return setLastError(QStringLiteral("No valid config found for keyserver_id: %1").arg(key.keyserver_id));
if(!cdoc20::checkConnection())
return false;
QScopedPointer<QNetworkAccessManager,QScopedPointerDeleteLater> nam(CheckConnection::setupNAM(req, Settings::CDOC2_GET_CERT));
QScopedPointer<QNetworkAccessManager,QScopedPointerDeleteLater> nam(CheckConnection::setupNAM(req, Settings::CDOC2_POST_CERT));
QEventLoop e;
QNetworkReply *reply = nam->post(req, QJsonDocument({
{QLatin1String("recipient_id"), QLatin1String(recipient_id.toBase64())},
@@ -717,7 +717,7 @@ QByteArray CDoc2::transportKey(const CKey &_key)
return {};
auto authKey = dispatchToMain(&QSigner::key, qApp->signer());
QScopedPointer<QNetworkAccessManager,QScopedPointerDeleteLater> nam(
CheckConnection::setupNAM(req, qApp->signer()->tokenauth().cert(), authKey, Settings::CDOC2_POST_CERT));
CheckConnection::setupNAM(req, qApp->signer()->tokenauth().cert(), authKey, Settings::CDOC2_GET_CERT));
QEventLoop e;
QNetworkReply *reply = nam->get(req);
connect(reply, &QNetworkReply::finished, &e, &QEventLoop::quit);
9 changes: 0 additions & 9 deletions client/CryptoDoc.cpp
Original file line number Diff line number Diff line change
@@ -392,15 +392,6 @@ QList<CKey> CryptoDoc::keys() const
return d->cdoc->keys;
}

QList<QString> CryptoDoc::files()
{
QList<QString> fileList;
fileList.reserve(d->cdoc->files.size());
for(const CDoc::File &f: qAsConst(d->cdoc->files))
fileList.append(f.name);
return fileList;
}

bool CryptoDoc::move(const QString &to)
{
if(!d->isEncrypted)
7 changes: 2 additions & 5 deletions client/CryptoDoc.h
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ class CKey
{
public:
CKey() = default;
CKey(const QByteArray &_key, bool _isRSA): key(_key), isRSA(_isRSA) {}
CKey(QByteArray _key, bool _isRSA): key(std::move(_key)), isRSA(_isRSA) {}
CKey(const QSslCertificate &cert);
bool operator==(const CKey &other) const { return other.key == key; }

@@ -90,7 +90,6 @@ class CryptoDoc final: public QObject
DocumentModel* documentModel() const;
bool encrypt(const QString &filename = {});
QString fileName() const;
QList<QString> files();
QList<CKey> keys() const;
bool move(const QString &to);
bool open( const QString &file );
@@ -114,13 +113,11 @@ class CDocumentModel final: public DocumentModel
QString data(int row) const final;
quint64 fileSize(int row) const final;
QString mime(int row) const final;
void open(int row) final;
bool removeRow(int row) final;
int rowCount() const final;
QString save(int row, const QString &path) const final;

public slots:
void open(int row) final;

private:
CDocumentModel(CryptoDoc::Private *doc);
Q_DISABLE_COPY(CDocumentModel)
4 changes: 1 addition & 3 deletions client/DigiDoc.h
Original file line number Diff line number Diff line change
@@ -97,13 +97,11 @@ class SDocumentModel final: public DocumentModel
QString data(int row) const final;
quint64 fileSize(int row) const final;
QString mime(int row) const final;
void open(int row) final;
bool removeRow(int row) final;
int rowCount() const final;
QString save(int row, const QString &path) const final;

public slots:
void open(int row) override;

private:
SDocumentModel(DigiDoc *container);
Q_DISABLE_COPY(SDocumentModel)

0 comments on commit 96fd63f

Please sign in to comment.