Showing sorted contacts, wow!

qml/pages/NewChatPage.qml

@@ -29,6 +29,12 @@ Page {
     property var contacts;
     property bool isLoading: true;
 
+    onStatusChanged: {
+        if (status === PageStatus.Active) {
+            newChatPage.contacts = tdLibWrapper.getContactsFullInfo();
+        }
+    }
+
     SilicaFlickable {
         id: newChatContainer
         contentHeight: newChatPage.height
@@ -50,7 +56,7 @@ Page {
                 clip: true
                 height: newChatPageColumn.height - newChatPageHeader.height
                 width: newChatPageColumn.width
-                opacity: newChatPage.isLoading ? 0 : 1
+                //opacity: newChatPage.isLoading ? 0 : 1
                 Behavior on opacity { FadeAnimation {} }
 
                 ViewPlaceholder {
@@ -80,7 +86,7 @@ Page {
                     }
 
                     onClicked: {
-                        tdLibWrapper.createPrivateChat(user_id);
+                        tdLibWrapper.createPrivateChat(modelData.id);
                     }
                 }
 

src/tdlibwrapper.cpp

@@ -43,6 +43,9 @@ namespace {
     const QString STATUS("status");
     const QString ID("id");
     const QString TYPE("type");
+    const QString LAST_NAME("last_name");
+    const QString FIRST_NAME("first_name");
+    const QString USERNAME("username");
     const QString _TYPE("@type");
     const QString _EXTRA("@extra");
 }
@@ -935,6 +938,49 @@ void TDLibWrapper::registerJoinChat()
     this->joinChatRequested = false;
 }
 
+static bool compareUsers(const QVariant &user1, const QVariant &user2)
+{
+    const QVariantMap userMap1 = user1.toMap();
+    const QVariantMap userMap2 = user2.toMap();
+
+    const QString lastName1 = userMap1.value(LAST_NAME).toString();
+    const QString lastName2 = userMap2.value(LAST_NAME).toString();
+    if (lastName1 < lastName2) {
+        return true;
+    } else if (lastName1 > lastName2) {
+        return false;
+    }
+    const QString firstName1 = userMap1.value(FIRST_NAME).toString();
+    const QString firstName2 = userMap2.value(FIRST_NAME).toString();
+    if (firstName1 < firstName2) {
+        return true;
+    } else if (firstName1 > firstName2) {
+        return false;
+    }
+    const QString userName1 = userMap1.value(USERNAME).toString();
+    const QString userName2 = userMap2.value(USERNAME).toString();
+    if (userName1 < userName2) {
+        return true;
+    } else if (userName1 > userName2) {
+        return false;
+    }
+    return userMap1.value(ID).toLongLong() < userMap2.value(ID).toLongLong();
+}
+
+QVariantList TDLibWrapper::getContactsFullInfo()
+{
+    QVariantList preparedContacts;
+    QListIterator<QString> userIdIterator(contacts);
+    while (userIdIterator.hasNext()) {
+        QString nextUserId = userIdIterator.next();
+        if (allUsers.contains(nextUserId)) {
+            preparedContacts.append(allUsers.value(nextUserId));
+        }
+    }
+    std::sort(preparedContacts.begin(), preparedContacts.end(), compareUsers);
+    return preparedContacts;
+}
+
 DBusAdaptor *TDLibWrapper::getDBusAdaptor()
 {
     return this->dbusInterface->getDBusAdaptor();
@@ -1152,12 +1198,14 @@ void TDLibWrapper::handleUsersReceived(const QString &extra, const QVariantList
     if (this->contactsRequested) {
         LOG("Received contacts list...");
         this->contactsRequested = false;
+        contacts.clear();
         QListIterator<QVariant> userIdIterator(userIds);
         while (userIdIterator.hasNext()) {
             QString nextUserId = userIdIterator.next().toString();
             if (!this->hasUserInformation(nextUserId)) {
                 this->getUserFullInfo(nextUserId);
             }
+            contacts.append(nextUserId);
         }
     }
     emit usersReceived(extra, userIds, totalUsers);

src/tdlibwrapper.h

@@ -106,6 +106,7 @@ public:
     Q_INVOKABLE void controlScreenSaver(bool enabled);
     Q_INVOKABLE bool getJoinChatRequested();
     Q_INVOKABLE void registerJoinChat();
+    Q_INVOKABLE QVariantList getContactsFullInfo();
 
     DBusAdaptor *getDBusAdaptor();
 
@@ -265,6 +266,7 @@ private:
     QVariantMap allUsers;
     QVariantMap allUserNames;
     QVariantMap chats;
+    QList<QString> contacts;
     QVariantMap unreadMessageInformation;
     QVariantMap unreadChatInformation;
     QHash<qlonglong,Group*> basicGroups;