diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 94c21538..b8223a58 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -503,7 +503,7 @@ UserSettingsPage::importSessionKeys()
auto sessions = mtx::crypto::decrypt_exported_sessions(
mtx::crypto::base642bin(payload), password.toStdString());
cache::client()->importSessionKeys(std::move(sessions));
- } catch (const std::exception &e) {
+ } catch (const mtx::crypto::sodium_exception &e) {
QMessageBox::warning(this, tr("Error"), e.what());
} catch (const lmdb::error &e) {
QMessageBox::warning(this, tr("Error"), e.what());
@@ -547,7 +547,7 @@ UserSettingsPage::exportSessionKeys()
auto b64 = mtx::crypto::bin2base64(encrypted_blob);
file.write(b64.data(), b64.size());
- } catch (const std::exception &e) {
+ } catch (const mtx::crypto::sodium_exception &e) {
QMessageBox::warning(this, tr("Error"), e.what());
} catch (const lmdb::error &e) {
QMessageBox::warning(this, tr("Error"), e.what());
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 82959b46..221f89a0 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -314,11 +314,13 @@ utils::linkifyMessage(const QString &body)
if (xml.name() == "html")
break;
- textString += "<" + xml.name();
+ textString += QString("<%1").arg(xml.name().toString());
const auto attrs = xml.attributes();
for (const auto &e : attrs)
- textString += QString(" %1=\"%2\"").arg(e.name()).arg(e.value());
+ textString += QString(" %1=\"%2\"")
+ .arg(e.name().toString())
+ .arg(e.value().toString());
textString += ">";
@@ -328,7 +330,7 @@ utils::linkifyMessage(const QString &body)
if (xml.name() == "html")
break;
- textString += "</" + xml.name() + ">";
+ textString += QString("</%1>").arg(xml.name().toString());
break;
}
default: {
|
