Fix crash when inviting users

CMakeLists.txt

@@ -195,7 +195,6 @@ set(SRC_FILES
     src/Community.cc
     src/Deserializable.cc
     src/InviteeItem.cc
-    src/InputValidator.cc
     src/LoginPage.cc
     src/MainWindow.cc
     src/MatrixClient.cc

include/InputValidator.h

@@ -1,30 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QRegExpValidator>
-
-class InputValidator
-{
-public:
-        // Validators for the different types of input.
-        static QRegExpValidator Id;
-        static QRegExpValidator Localpart;
-        static QRegExpValidator Password;
-        static QRegExpValidator Domain;
-};

src/ChatPage.cc

@@ -149,7 +149,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
 
         connect(top_bar_, &TopRoomBar::inviteUsers, this, [this](QStringList users) {
                 for (int ii = 0; ii < users.size(); ++ii) {
-                        QTimer::singleShot(ii * 1000, this, [this, &ii, &users]() {
+                        QTimer::singleShot(ii * 1000, this, [this, ii, users]() {
                                 client_->inviteUser(current_room_, users.at(ii));
                         });
                 }

src/InputValidator.cc

@@ -1,29 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "InputValidator.h"
-
-const QRegExp MXID_REGEX("@[A-Za-z0-9._%+-]+:[A-Za-z0-9.-]{1,126}\\.[A-Za-z]{1,63}");
-const QRegExp LOCALPART_REGEX("[A-za-z0-9._%+-]{3,}");
-const QRegExp PASSWORD_REGEX(".{8,}");
-const QRegExp DOMAIN_REGEX("(?!\\-)(?:[a-zA-Z\\d\\-]{0,62}[a-zA-Z\\d]\\.){1,"
-                           "126}(?!\\d+)[a-zA-Z\\d]{1,63}");
-
-QRegExpValidator InputValidator::Id(MXID_REGEX);
-QRegExpValidator InputValidator::Localpart(LOCALPART_REGEX);
-QRegExpValidator InputValidator::Password(PASSWORD_REGEX);
-QRegExpValidator InputValidator::Domain(DOMAIN_REGEX);

src/LoginPage.cc

@@ -17,9 +17,10 @@
 
 #include <QStyleOption>
 
+#include <mtx/identifiers.hpp>
+
 #include "Config.h"
 #include "FlatButton.h"
-#include "InputValidator.h"
 #include "LoadingIndicator.h"
 #include "LoginPage.h"
 #include "MatrixClient.h"
@@ -27,6 +28,8 @@
 #include "RaisedButton.h"
 #include "TextField.h"
 
+using namespace mtx::identifiers;
+
 LoginPage::LoginPage(QSharedPointer<MatrixClient> client, QWidget *parent)
   : QWidget(parent)
   , inferredServerAddress_()
@@ -157,10 +160,16 @@ LoginPage::loginError(QString error)
 bool
 LoginPage::isMatrixIdValid()
 {
-        int pos        = 0;
         auto matrix_id = matrixid_input_->text();
 
-        return InputValidator::Id.validate(matrix_id, pos) == QValidator::Acceptable;
+        try {
+                parse<User>(matrix_id.toStdString());
+                return true;
+        } catch (const std::exception &e) {
+                return false;
+        }
+
+        return false;
 }
 
 void

src/RegisterPage.cc

@@ -19,7 +19,6 @@
 
 #include "Config.h"
 #include "FlatButton.h"
-#include "InputValidator.h"
 #include "MatrixClient.h"
 #include "RaisedButton.h"
 #include "RegisterPage.h"
@@ -128,10 +127,6 @@ RegisterPage::RegisterPage(QSharedPointer<MatrixClient> client, QWidget *parent)
                 this,
                 SLOT(registerError(const QString &)));
 
-        username_input_->setValidator(&InputValidator::Localpart);
-        password_input_->setValidator(&InputValidator::Password);
-        server_input_->setValidator(&InputValidator::Domain);
-
         setLayout(top_layout_);
 }