diff options
| author | trilene <trilene@runbox.com> | 2020-10-28 16:08:17 -0400 |
|---|---|---|
| committer | trilene <trilene@runbox.com> | 2020-10-28 16:08:17 -0400 |
| commit | fd479a91be3c0c7f3204c94ce499edb6cf7fbd77 (patch) | |
| tree | 9225e0c824f4c0e578e73c7dfba48dfaef277884 /src/UserSettingsPage.cpp | |
| parent | Fix crash on exit (diff) | |
| parent | Make back button bigger as it is hard to tap with your thumb (diff) | |
| download | nheko-fd479a91be3c0c7f3204c94ce499edb6cf7fbd77.tar.xz | |
Merge remote-tracking branch 'upstream/master' into webrtc-video
Diffstat (limited to 'src/UserSettingsPage.cpp')
| -rw-r--r-- | src/UserSettingsPage.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 308ec9a2..a5a40111 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -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()); } } |