Connection: no more default to matrix.org; update HS URL from /login response

2 files changed, 5 insertions, 5 deletions

diff --git a/connection.cpp b/connection.cpp
index c29f09fe..3e4f1efb 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -77,10 +77,9 @@ Connection::Connection(const QUrl& server, QObject* parent)
     d->q = this; // All d initialization should occur before this line
 }
 
-Connection::Connection()
-    : Connection(QUrl("https://matrix.org"))
-{
-}
+Connection::Connection(QObject* parent)
+    : Connection({}, parent)
+{ }
 
 Connection::~Connection()
 {
@@ -165,6 +164,7 @@ void Connection::doConnectToServer(const QString& user, const QString& password,
             deviceId, initialDeviceName);
     connect(loginJob, &BaseJob::success, this,
         [=] {
+            setHomeserver(loginJob->homeServer());
             d->connectWithToken(loginJob->userId(), loginJob->accessToken(),
                                 loginJob->deviceId());
         });
diff --git a/connection.h b/connection.h
index fc6f4588..ecebb2e7 100644
--- a/connection.h
+++ b/connection.h
@@ -57,8 +57,8 @@ namespace QMatrixClient
             using user_factory_t =
                 std::function<User*(Connection*, const QString&)>;
 
+            explicit Connection(QObject* parent = nullptr);
             explicit Connection(const QUrl& server, QObject* parent = nullptr);
-            Connection();
             virtual ~Connection();
 
             QHash<QPair<QString, bool>, Room*> roomMap() const;