Merge lp:~d.filoni/telegram-app/fix1642971_1642637 into lp:telegram-app

[Devid Antonio Filoni]

This MR fixes bug #1642971. Tested on desktop.

[lp:~d.filoni/telegram-app/fix1642971_1642637]

250. By Devid Antonio Filoni on 2016-11-20

Fix bug #1642637

[Devid Antonio Filoni (d.filoni)]

Commit #250 fixes bug #1642637 . I decided to push it in the same branch because commit #249 is trivial. I tested both commits on desktop (xenial) and mobile (mako).

[Roberto Mier Escandon (rmescandon)]

I cannot reproduce 1642637 with current trunk but 1642971 is fixed with this change

review: Approve

[Devid Antonio Filoni (d.filoni)]

Hi Roberto, you can reproduce 1642637 in desktop (you have to enlarge the window to have two columns). Thank you for the review!

[Jin (jindallo)]

@Devid,

Please see my inline comment below.

review: Needs Fixing

[Jin (jindallo)]

@Devid,

Please see my inline comment below.

review: Needs Fixing

[Devid Antonio Filoni (d.filoni)]

Hi Jin,
I tried again removing currentDialog = telegramObject.nullDialog; line however without it, bug 1642637 is not fixed, the issue is still there when you have two columns (so desktop or tablet mode) and you forward a message to the same chat/user (e.g. I'm chatting with A and I forward a message from A chat to A chat). It works fine keeping that code line.

[Jin (jindallo)]

@Devid,

Well, it is weird but I can accept the way if some comments added for the line,
for the other developers.

I approve and will do that,
you could have a check from our main trunk later.

Thanks for the contribution!

review: Approve

=== modified file 'telegram/app/qml/AccountDialogList.qml'
--- telegram/app/qml/AccountDialogList.qml	2016-11-09 10:32:21 +0000
+++ telegram/app/qml/AccountDialogList.qml	2016-11-20 21:37:36 +0000
@@ -104,9 +104,7 @@
             }
 
             onCurrentDialogChanged: {
-                if (list_item.width > units.gu(35)) {
-                    currentDialog = telegramObject.nullDialog;
-                }
+                currentDialog = telegramObject.nullDialog;
                 currentDialog = dialog;
             }
 

=== modified file 'telegram/app/qml/AddContactPage.qml'
--- telegram/app/qml/AddContactPage.qml	2016-06-23 09:57:19 +0000
+++ telegram/app/qml/AddContactPage.qml	2016-11-20 21:37:36 +0000
@@ -37,6 +37,12 @@
                 onTriggered: addContact()
             }
         ]
+        leadingActionBar.actions: Action {
+            id: back_action
+            objectName: "backAction"
+            iconName: "back"
+            onTriggered: pageStack.removePages(page);
+        }
     }
 
     Item {