Page MenuHomePhorge
Files F85120790

D315.1782468242.diff
No OneTemporary
Actions

Size
11 KB
Referenced Files
None
Subscribers
None

D315.1782468242.diff
View Options

diff --git a/src/main.cpp b/src/main.cpp
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,7 +30,6 @@
Q_DECL_EXPORT int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication app(argc, argv);
QCoreApplication::setOrganizationName(u"project-kazv"_s);
QCoreApplication::setOrganizationDomain(u"mxc.kazv.moe"_s);
diff --git a/src/matrix-sdk.cpp b/src/matrix-sdk.cpp
--- a/src/matrix-sdk.cpp
+++ b/src/matrix-sdk.cpp
@@ -192,7 +192,7 @@
m_d->runIoContext();
}
-void MatrixSdk::handleLoadSessionResult(QString sessionName, Constants::LoadSessionResult result)
+void MatrixSdk::handleLoadSessionResult([[maybe_unused]] QString sessionName, Constants::LoadSessionResult result)
{
if (result == Constants::SessionLoadSuccess) {
m_d->controller->startSyncing();
diff --git a/src/matrix-session.hpp b/src/matrix-session.hpp
--- a/src/matrix-session.hpp
+++ b/src/matrix-session.hpp
@@ -90,9 +90,9 @@
Q_INVOKABLE MatrixVerificationList *verificationList() const;
Q_SIGNALS:
- void trigger(Kazv::KazvEvent e);
+ void trigger(Kazv::KazvTrigger e);
- void loginSuccessful(Kazv::KazvEvent e);
+ void loginSuccessful(Kazv::KazvTrigger e);
void loginFailed(QString errorCode, QString errorMsg);
void discoverFailed(QString errorCode, QString errorMsg);
void discoverSuccessful(QString serverUrl);
diff --git a/src/matrix-session.cpp b/src/matrix-session.cpp
--- a/src/matrix-session.cpp
+++ b/src/matrix-session.cpp
@@ -52,7 +52,7 @@
, LAGER_QT(specVersions)(m_clientOnSecondaryRoot.supportVersions())
{
m_watchable.afterAll(
- [this](KazvEvent e) {
+ [this](KazvTrigger e) {
Q_EMIT this->trigger(e);
});
@@ -216,7 +216,8 @@
serverUrl,
userId.toStdString(),
password.toStdString(),
- clientName
+ clientName,
+ /* startSyncingOnSuccess = */ true
);
};
@@ -309,7 +310,8 @@
m_clientOnSecondaryRoot.mLoginTokenLogin(
homeserverUrl.toStdString(),
loginToken.toStdString(),
- clientName
+ clientName,
+ /* startSyncingOnSuccess = */ true
);
});
return link;
diff --git a/src/meta-types.hpp b/src/meta-types.hpp
--- a/src/meta-types.hpp
+++ b/src/meta-types.hpp
@@ -9,11 +9,11 @@
#include <QMetaType>
-#include <base/kazvevents.hpp>
+#include <base/kazv-triggers.hpp>
#include "matrix-sticker-pack-source.hpp"
#include "kazv-platform.hpp"
-Q_DECLARE_METATYPE(Kazv::KazvEvent)
+Q_DECLARE_METATYPE(Kazv::KazvTrigger)
Q_DECLARE_METATYPE(MatrixStickerPackSource)
class KazvMetaTypeRegistration
@@ -21,6 +21,6 @@
public:
KazvMetaTypeRegistration();
- int m_kazvEvent;
+ int m_kazvTrigger;
int m_matrixStickerPackSource;
};
diff --git a/src/meta-types.cpp b/src/meta-types.cpp
--- a/src/meta-types.cpp
+++ b/src/meta-types.cpp
@@ -10,7 +10,7 @@
#include "kazv-platform.hpp"
KazvMetaTypeRegistration::KazvMetaTypeRegistration()
- : m_kazvEvent(qRegisterMetaType<Kazv::KazvEvent>())
+ : m_kazvTrigger(qRegisterMetaType<Kazv::KazvTrigger>())
, m_matrixStickerPackSource(qRegisterMetaType<MatrixStickerPackSource>())
{
}
diff --git a/src/tests/kazv-file-test.cpp b/src/tests/kazv-file-test.cpp
--- a/src/tests/kazv-file-test.cpp
+++ b/src/tests/kazv-file-test.cpp
@@ -31,7 +31,8 @@
dir.isValid();
auto rawContent = QByteArrayLiteral("Some test content");
QSaveFile rawFile{dir.filePath(QStringLiteral("rawFile"))};
- rawFile.open(QIODevice::WriteOnly);
+ auto openResult = rawFile.open(QIODevice::WriteOnly);
+ QVERIFY(openResult);
rawFile.write(rawContent.data(), rawContent.size());
rawFile.commit();
Kazv::RandomInterface randomGenerator = QtRandAdapter{};
@@ -39,17 +40,20 @@
randomGenerator.generateRange<Kazv::RandomData>(
Kazv::AES256CTRDesc::randomSize));
KazvFile kazvFile{rawFile.fileName(), aes};
- kazvFile.open(QIODevice::ReadOnly);
+ openResult = kazvFile.open(QIODevice::ReadOnly);
+ QVERIFY(openResult);
QByteArray encryptedContent = kazvFile.readAll();
kazvFile.close();
KazvSaveFile kazvSaveFile{
dir.filePath(QStringLiteral("decryptedFile")), aes};
- kazvSaveFile.open(QIODevice::WriteOnly);
+ openResult = kazvSaveFile.open(QIODevice::WriteOnly);
+ QVERIFY(openResult);
kazvSaveFile.write(encryptedContent.data(),
encryptedContent.size());
kazvSaveFile.commit();
QFile file{kazvSaveFile.fileName()};
- file.open(QIODevice::ReadOnly);
+ openResult = file.open(QIODevice::ReadOnly);
+ QVERIFY(openResult);
auto decryptedContent = file.readAll();
QCOMPARE(decryptedContent, rawContent);
}
diff --git a/src/tests/kazv-io-job-test.cpp b/src/tests/kazv-io-job-test.cpp
--- a/src/tests/kazv-io-job-test.cpp
+++ b/src/tests/kazv-io-job-test.cpp
@@ -82,7 +82,8 @@
void KazvIOJobTest::initTestCase()
{
- downloadFile.open();
+ auto openResult = downloadFile.open();
+ QVERIFY(openResult);
downloadFile.write(downloadFileContent);
downloadFile.close();
downloadFileHash.addData(&downloadFile);
@@ -97,7 +98,8 @@
using QHttpServerResponderRef = QHttpServerResponder &;
#endif
httpServer.route(downloadEndpoint, [this](QHttpServerResponderRef res) {
- downloadFile.open();
+ auto openResult = downloadFile.open();
+ QVERIFY(openResult);
res.write(downloadFile.readAll(), "application/octet-stream"_ba);
downloadFile.close();
});
@@ -112,7 +114,8 @@
return QHttpServerResponse(QHttpServerResponder::StatusCode::Ok);
});
httpServer.route(downloadPauseEndpoint, [this](QHttpServerResponderRef res) {
- downloadFile.open();
+ auto openResult = downloadFile.open();
+ QVERIFY(openResult);
QSignalSpy qs{this, &KazvIOJobTest::readyResume};
Q_EMIT readyPause();
QVERIFY(qs.wait());
@@ -120,7 +123,8 @@
downloadFile.close();
});
httpServer.route(downloadCancelEndpoint, [this](QHttpServerResponderRef /* res */) {
- downloadFile.open();
+ auto openResult = downloadFile.open();
+ QVERIFY(openResult);
QSignalSpy qs{this, &KazvIOJobTest::canceled};
Q_EMIT readyCancel();
QVERIFY(qs.wait());
@@ -128,7 +132,10 @@
});
httpServer.route(uploadEndpoint, [this](const QHttpServerRequest &req) {
if (req.body() == uploadFileContent) {
- uploadFile.open();
+ auto openResult = uploadFile.open();
+ if (!openResult) {
+ throw std::runtime_error("Cannot open upload file");
+ }
uploadFile.write(req.body());
uploadFile.close();
auto resJson = QJsonObject{{u"content_uri"_s, u"mxc://uri"_s}};
@@ -168,8 +175,10 @@
QCOMPARE(job.error(), KazvIOBaseJob::NoError);
QFile savedFile{fileName};
- savedFile.open(QIODevice::ReadOnly);
- downloadFile.open();
+ auto openResult = savedFile.open(QIODevice::ReadOnly);
+ QVERIFY(openResult);
+ openResult = downloadFile.open();
+ QVERIFY(openResult);
QCOMPARE(downloadFile.readAll(), savedFile.readAll());
downloadFile.close();
savedFile.close();
@@ -190,7 +199,8 @@
void KazvIOJobTest::testUpload()
{
QTemporaryFile file;
- file.open();
+ auto openResult = file.open();
+ QVERIFY(openResult);
file.write(uploadFileContent);
file.close();
auto url = QUrl{serverUrl};
@@ -201,8 +211,10 @@
QCOMPARE(job.error(), KazvIOBaseJob::NoError);
- file.open();
- uploadFile.open();
+ openResult = file.open();
+ QVERIFY(openResult);
+ openResult = uploadFile.open();
+ QVERIFY(openResult);
QCOMPARE(uploadFile.readAll(), file.readAll());
uploadFile.close();
file.close();
@@ -227,8 +239,10 @@
QCOMPARE(job.error(), KazvIOBaseJob::NoError);
QFile savedFile{fileName};
- savedFile.open(QIODevice::ReadOnly);
- downloadFile.open();
+ auto openResult = savedFile.open(QIODevice::ReadOnly);
+ QVERIFY(openResult);
+ openResult = downloadFile.open();
+ QVERIFY(openResult);
QCOMPARE(downloadFile.readAll(), savedFile.readAll());
downloadFile.close();
savedFile.close();
@@ -237,7 +251,8 @@
void KazvIOJobTest::testUploadPause()
{
QTemporaryFile file;
- file.open();
+ auto openResult = file.open();
+ QVERIFY(openResult);
file.write(uploadFileContent);
file.close();
auto url = QUrl{serverUrl};
@@ -252,8 +267,10 @@
QCOMPARE(job.error(), KazvIOBaseJob::NoError);
- file.open();
- uploadFile.open();
+ openResult = file.open();
+ QVERIFY(openResult);
+ openResult = uploadFile.open();
+ QVERIFY(openResult);
QCOMPARE(uploadFile.readAll(), file.readAll());
uploadFile.close();
file.close();
@@ -282,7 +299,8 @@
void KazvIOJobTest::testUploadCancel()
{
QTemporaryFile file;
- file.open();
+ auto openResult = file.open();
+ QVERIFY(openResult);
file.write(uploadFileContent);
file.close();
auto url = QUrl{serverUrl};
@@ -326,7 +344,8 @@
void KazvIOJobTest::testUploadFileName()
{
QTemporaryFile file;
- file.open();
+ auto openResult = file.open();
+ QVERIFY(openResult);
file.write(uploadFileContent);
file.close();
auto url = QUrl{serverUrl};
@@ -344,7 +363,8 @@
auto url = QUrl{serverUrl + downloadEndpoint};
QFile savedFile{fileName};
- savedFile.open(QIODevice::ReadWrite);
+ auto openResult = savedFile.open(QIODevice::ReadWrite);
+ QVERIFY(openResult);
savedFile.close();
// Remove all permissions so that Qt cannot open this file
QVERIFY(savedFile.setPermissions({}));
@@ -358,7 +378,8 @@
void KazvIOJobTest::testUploadOpenFileError()
{
QTemporaryFile file;
- file.open();
+ auto openResult = file.open();
+ QVERIFY(openResult);
file.write(uploadFileContent);
file.close();
auto url = QUrl{serverUrl};
@@ -387,7 +408,8 @@
void KazvIOJobTest::testUploadKIOError()
{
QTemporaryFile file;
- file.open();
+ auto openResult = file.open();
+ QVERIFY(openResult);
file.write(uploadFileContent);
file.close();
auto wrongUrl = QUrl{};
@@ -401,7 +423,8 @@
void KazvIOJobTest::testResponseError()
{
QTemporaryFile file;
- file.open();
+ auto openResult = file.open();
+ QVERIFY(openResult);
file.write(responseErrorContent);
file.close();
auto url = QUrl{serverUrl};
diff --git a/src/tests/kazv-io-manager-test.cpp b/src/tests/kazv-io-manager-test.cpp
--- a/src/tests/kazv-io-manager-test.cpp
+++ b/src/tests/kazv-io-manager-test.cpp
@@ -55,7 +55,8 @@
void KazvIOManagerTest::initTestCase()
{
- downloadFile.open();
+ auto openResult = downloadFile.open();
+ QVERIFY(openResult);
downloadFile.write(downloadFileContent);
downloadFile.close();
@@ -70,7 +71,8 @@
QSignalSpy qs{this, &KazvIOManagerTest::readyResume};
Q_EMIT readyPause();
QVERIFY(qs.wait());
- downloadFile.open();
+ auto openResult = downloadFile.open();
+ QVERIFY(openResult);
res.write(downloadFile.readAll(), "application/octet-stream"_ba);
downloadFile.close();
});

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 26, 3:04 AM (21 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1626577
Default Alt Text
D315.1782468242.diff (11 KB)

Event Timeline