thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into webrtc-video

Browse source
This commit is contained in:
trilene 2020-10-28 16:08:17 -04:00
commit fd479a91be
37 changed files with 452 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/UserSettingsPage.cpp
View file

@ -1006,11 +1006,7 @@ UserSettingsPage::importSessionKeys()
auto sessions =
mtx::crypto::decrypt_exported_sessions(payload, password.toStdString());
cache::importSessionKeys(std::move(sessions));
} 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());
} catch (const nlohmann::json::exception &e) {
} catch (const std::exception &e) {
QMessageBox::warning(this, tr("Error"), e.what());
}
}
@ -1058,11 +1054,7 @@ UserSettingsPage::exportSessionKeys()
QTextStream out(&file);
out << prefix << newline << b64 << newline << suffix;
file.close();
} 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());
} catch (const nlohmann::json::exception &e) {
} catch (const std::exception &e) {
QMessageBox::warning(this, tr("Error"), e.what());
}
}