Merge lp:~libqtelegram-team/telegram-app/app-very-slow-great-lag-after-update-2.2.4 into lp:telegram-app

[Jin]

[Roberto Mier Escandon (rmescandon)]

much better. Ship it!

review: Approve

[Jin (jindallo)]

Hello Roberto,

Thanks for your approval!

=== modified file 'telegram/app/qml/AccountContactsPage.qml'
--- telegram/app/qml/AccountContactsPage.qml	2016-04-28 12:07:11 +0000
+++ telegram/app/qml/AccountContactsPage.qml	2016-05-15 13:27:32 +0000
@@ -128,7 +128,7 @@
                 text: i18n.tr("Back")
                 onTriggered: {
                     page.state = "default"
-                    pageStack.clear();
+                    pageStack.removePages(page);
                 }
             }
         }
@@ -265,7 +265,7 @@
 //                    refreshSubtitle();
                 } else if (newSecretChatMode) {
                     telegramObject.messagesCreateEncryptedChat(model.id);
-                    pageStack.clear();
+                    pageStack.removePages(page);
                 } else if (addToGroupMode) {
                     var dialog = PopupUtils.open(add_contact_to_group_chat_component);
                     dialog.setData(user.id, user.fullName, groupChatTitle);
@@ -289,7 +289,7 @@
             telegram.messagesCreateChat(list.list, groupChatTitle);
             state = "default";
             groupChatTitle = "";
-            pageStack.clear();
+            pageStack.removePages(page);
         }
 
         function refreshSubtitle() {

=== modified file 'telegram/app/qml/AccountDialogPage.qml'
--- telegram/app/qml/AccountDialogPage.qml	2016-04-27 08:49:59 +0000
+++ telegram/app/qml/AccountDialogPage.qml	2016-05-15 13:27:32 +0000
@@ -60,7 +60,10 @@
             iconName: "next"
             text: i18n.tr("Forward")
             visible: enchat == telegramObject.nullEncryptedChat
-            onTriggered: message_list.forwardSelected()
+            onTriggered: {
+                message_list.forwardSelected()
+                pageStack.removePages(dialog_page)
+            }
         },
         Action {
             id: multiDeleteAction
@@ -84,7 +87,7 @@
             if (message_list.inSelectionMode) {
                 message_list.cancelSelection()
             } else {
-                pageStack.removePages(pageStack.primaryPage);
+                pageStack.removePages(dialog_page);
             }
         }
     }
@@ -218,8 +221,11 @@
             telegramObject: dialog_page.telegramObject
             currentDialog: dialog_page.currentDialog
 
-//            onFocusRequest: send_msg.setFocus()
-            onForwardRequest: dialog_page.forwardRequest(messageIds);
+            //onFocusRequest: send_msg.setFocus()
+            onForwardRequest: {
+                dialog_page.forwardRequest(messageIds);
+                pageStack.removePages(dialog_page);
+            }
             onDialogRequest: account_page.currentDialog = dialogObject
             onTagSearchRequest: msg_box.tagSearchRequest(tag)
             onReplyToRequest: send_msg.replyTo(msgId)

=== modified file 'telegram/app/qml/AccountListItem.qml'
--- telegram/app/qml/AccountListItem.qml	2016-04-08 06:26:31 +0000
+++ telegram/app/qml/AccountListItem.qml	2016-05-15 13:27:32 +0000
@@ -92,6 +92,7 @@
         }
         onAuthCodeRequested: {
             console.log("authCodeRequested");
+            pageStack.setPrimaryPage();
             pageStack.addPageToCurrentColumn(pageStack.primaryPage, account_code_page_component, {
                     "phoneRegistered": telegram.authPhoneRegistered,
                     "timeOut": sendCallTimeout

=== modified file 'telegram/app/qml/AccountPage.qml'
--- telegram/app/qml/AccountPage.qml	2016-04-29 11:20:20 +0000
+++ telegram/app/qml/AccountPage.qml	2016-05-15 13:27:32 +0000
@@ -15,7 +15,6 @@
     id: account_page
 
     property int profileCount: 0
-    property var dialogPage;
 
     property alias telegramObject: dialogs.telegramObject
     property alias currentDialog: dialogs.currentDialog
@@ -40,7 +39,7 @@
 //        acc_frame.activeRequest()
 //        Cutegram.active()
 
-        pageStack.addPageToNextColumn(pageStack.primaryPage, account_dialog_page, {
+        pageStack.addPageToNextColumn(account_page, account_dialog_page, {
                 "telegramObject": telegramObject,
                 "currentDialog": currentDialog
         });
@@ -85,27 +84,27 @@
         z: 10
 
         onNewSecretChatClicked: {
-            pageStack.addPageToCurrentColumn(pageStack.primaryPage, contacts_page_component, {
+            pageStack.addPageToCurrentColumn(account_page, contacts_page_component, {
                     "telegram": telegramObject,
                     "state": "new-secret-chat"
             });
         }
 
         onNewGroupClicked: {
-            pageStack.addPageToCurrentColumn(pageStack.primaryPage, contacts_page_component, {
+            pageStack.addPageToCurrentColumn(account_page, contacts_page_component, {
                     "telegram": telegramObject,
                     "state": "new-group-chat"
             });
         }
 
         onContactsClicked: {
-            pageStack.addPageToCurrentColumn(pageStack.primaryPage, contacts_page_component, {
+            pageStack.addPageToCurrentColumn(account_page, contacts_page_component, {
                     "telegram": telegramObject
             });
         }
 
         onSettingsClicked: {
-            pageStack.addPageToNextColumn(pageStack.primaryPage, settings_page_component, {
+            pageStack.addPageToNextColumn(account_page, settings_page_component, {
                     "telegram": telegramObject
             });
         }
@@ -115,7 +114,7 @@
         }
 
         onAddAccountClicked: {
-            pageStack.addPageToCurrentColumn(pageStack.primaryPage, auth_countries_page_component);
+            pageStack.addPageToCurrentColumn(account_page, auth_countries_page_component);
         }
 
         onAccountClicked: {
@@ -176,7 +175,7 @@
         onCurrentDialogChanged: {
             if (currentDialog && currentDialog != telegramObject.nullDialog) {
                 pageStack.clear();
-                dialogPage = pageStack.addPageToNextColumn(pageStack.primaryPage, account_dialog_page, {"maxId": 0});
+                pageStack.addPageToNextColumn(account_page, account_dialog_page, {"maxId": 0});
 
                 var tag = currentDialog.peer.chatId ? currentDialog.peer.chatId : currentDialog.peer.userId;
                 pushClient.clearPersistent([tag]);
@@ -247,7 +246,7 @@
             }
 
             onAddContactManually: {
-                pageStack.addPageToNextColumn(pageStack.primaryPage, add_contact_page_component, {
+                pageStack.addPageToNextColumn(account_page, add_contact_page_component, {
                         "telegram": telegramObject,
                         "addManually": true
                 });

=== modified file 'telegram/app/qml/ProfilePage.qml'
--- telegram/app/qml/ProfilePage.qml	2016-04-08 06:08:04 +0000
+++ telegram/app/qml/ProfilePage.qml	2016-05-15 13:27:32 +0000
@@ -113,7 +113,7 @@
     }
 
     function addMember() {
-        pageStack.addPageToNextColumn(pageStack.primaryPage, contacts_page_component, {
+        pageStack.addPageToNextColumn(profile_page, contacts_page_component, {
             telegram: telegram,
             state: "add-to-group",
             groupChatId: dialogId,

=== modified file 'telegram/app/qml/telegram.qml'
--- telegram/app/qml/telegram.qml	2016-04-29 10:33:09 +0000
+++ telegram/app/qml/telegram.qml	2016-05-15 13:27:32 +0000
@@ -90,7 +90,7 @@
     function showIntro() {
         pageStack.forceSinglePage = (profiles.count == 0);
         if (profiles.count == 0) {
-            pageStack.primaryPageSource = intro_page_component;
+            pageStack.primaryPage = introPage;
         }
     }
 
@@ -233,6 +233,7 @@
 
         property bool forceSinglePage: false
 
+        asynchronous: false
         anchors.fill: parent
         layouts: [
             PageColumnsLayout {
@@ -257,18 +258,19 @@
             }
         ]
 
+        function setPrimaryPage() {
+            pageStack.primaryPage = introPage;
+        }
+
         function clear() {
             pageStack.removePages(pageStack.primaryPage);
         }
 
-        Component {
-            id: intro_page_component
-
-            IntroPage {
-                onStartMessaging: {
-                    pageStack.forceSinglePage = false;
-                    pageStack.addPageToCurrentColumn(pageStack.primaryPage, auth_countries_page_component);
-                }
+        IntroPage {
+            id: introPage
+            onStartMessaging: {
+                pageStack.forceSinglePage = false;
+                pageStack.addPageToCurrentColumn(introPage, auth_countries_page_component);
             }
         }
 
@@ -276,8 +278,9 @@
             id: auth_countries_page_component
 
             AuthCountriesPage {
+                id: authCountriesPage
                 onCountryEntered: {
-                    pageStack.addPageToNextColumn(pageStack.primaryPage, auth_number_page_component, {
+                    pageStack.addPageToNextColumn(authCountriesPage, auth_number_page_component, {
                             "countryCode": code
                     });
                 }