diff --git a/README.md b/README.md index 1f17d4a386339d6117e102c913fa30649b28da89..71e486bb4ab5346b47bc571a3b064e4363744a19 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ nheko ---- -[](https://travis-ci.org/Nheko-Reborn/nheko) +[](https://nheko.im/nheko-reborn/nheko/-/pipelines/latest) [](https://ci.appveyor.com/project/redsky17/nheko/branch/master) [](https://github.com/Nheko-Reborn/nheko/releases/v0.7.2) [](https://matrix-static.neko.dev/room/!TshDrgpBNBDmfDeEGN:neko.dev/) @@ -56,6 +56,7 @@ can be found in the [Github releases](https://github.com/Nheko-Reborn/nheko/rele [](https://repology.org/project/nheko/versions) #### Arch Linux + ```bash pacaur -S nheko # nheko-git ``` diff --git a/src/Olm.cpp b/src/Olm.cpp index 808279a354920054885230278a92e207fb73ebf3..1f58758c1672693700890d3469d453206fe352ea 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -602,8 +602,9 @@ send_key_request_for(mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> e, e.content.session_id); mtx::events::msg::KeyRequest request; - request.action = !cancel ? mtx::events::msg::RequestAction::Request - : mtx::events::msg::RequestAction::Cancellation; + request.action = cancel ? mtx::events::msg::RequestAction::Cancellation + : mtx::events::msg::RequestAction::Request; + request.algorithm = MEGOLM_ALGO; request.room_id = e.room_id; request.sender_key = e.content.sender_key; diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp index 26a66ab7ae3e4ceef31bd0a7321b2eb3d76e0863..44ad7a3d52fb554303024fa49668202b5654edb7 100644 --- a/src/RegisterPage.cpp +++ b/src/RegisterPage.cpp @@ -405,7 +405,9 @@ void RegisterPage::onRegisterButtonClicked() { if (!checkFields()) { - showError(error_label_, tr("One or more fields have invalid inputs. Please correct those issues and try again.")); + showError(error_label_, + tr("One or more fields have invalid inputs. Please correct those issues " + "and try again.")); return; } else { auto username = username_input_->text().toStdString(); diff --git a/src/Utils.cpp b/src/Utils.cpp index 463c8af3338ea00b032243abeccae185072cafce..7fcaf5e2768ebd97dce69aa46640a65685e93802 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -638,8 +638,8 @@ utils::luminance(const QColor &col) qreal lumRgb[3]; for (int i = 0; i < 3; i++) { - qreal v = colRgb[i] / 255.0; - v <= 0.03928 ? lumRgb[i] = v / 12.92 : lumRgb[i] = qPow((v + 0.055) / 1.055, 2.4); + qreal v = colRgb[i] / 255.0; + lumRgb[i] = v <= 0.03928 ? v / 12.92 : qPow((v + 0.055) / 1.055, 2.4); } auto lum = lumRgb[0] * 0.2126 + lumRgb[1] * 0.7152 + lumRgb[2] * 0.0722;