Add support for displaying decrypted messages

1 files changed, 4 insertions, 9 deletions

diff --git a/src/MainWindow.cc b/src/MainWindow.cc

index 9ba8b28e..cca51f03 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cc
@@ -46,15 +46,6 @@
 
 MainWindow *MainWindow::instance_ = nullptr;
 
-MainWindow::~MainWindow()
-{
-        if (http::v2::client() != nullptr) {
-                http::v2::client()->shutdown();
-                // TODO: find out why waiting for the threads to join is slow.
-                http::v2::client()->close();
-        }
-}
-
 MainWindow::MainWindow(QWidget *parent)
   : QMainWindow(parent)
   , progressModal_{nullptr}
@@ -154,9 +145,11 @@ MainWindow::MainWindow(QWidget *parent)
                 QString token       = settings.value("auth/access_token").toString();
                 QString home_server = settings.value("auth/home_server").toString();
                 QString user_id     = settings.value("auth/user_id").toString();
+                QString device_id   = settings.value("auth/device_id").toString();
 
                 http::v2::client()->set_access_token(token.toStdString());
                 http::v2::client()->set_server(home_server.toStdString());
+                http::v2::client()->set_device_id(device_id.toStdString());
 
                 try {
                         using namespace mtx::identifiers;
@@ -228,6 +221,7 @@ void
 MainWindow::showChatPage()
 {
         auto userid     = QString::fromStdString(http::v2::client()->user_id().to_string());
+        auto device_id  = QString::fromStdString(http::v2::client()->device_id());
         auto homeserver = QString::fromStdString(http::v2::client()->server() + ":" +
                                                  std::to_string(http::v2::client()->port()));
         auto token      = QString::fromStdString(http::v2::client()->access_token());
@@ -236,6 +230,7 @@ MainWindow::showChatPage()
         settings.setValue("auth/access_token", token);
         settings.setValue("auth/home_server", homeserver);
         settings.setValue("auth/user_id", userid);
+        settings.setValue("auth/device_id", device_id);
 
         showOverlayProgressBar();