Merge lp:~cellsoftware/telegram-app/1599030 into lp:telegram-app

[Ash]

[Jin (jindallo)]

Code looks good,
I will approve after verified pass locally.

[Jin (jindallo)]

Hello Ash,

It verified failed from my local,
I follow below steps:
    a) Launch Telegram app
    b) Put the app into background
    c) Send group messages from other clients
    d) Click the notification on Ubuntu Touch unity panel
    e) Telegram set the dialog focused but does not enter the dialog window properly

Could you please have a check on above scenario?
Many thanks.

review: Needs Fixing

[Jin (jindallo)]

More information here:
If does not launch the application or the process is killed,
the behavior looks fine after step d),
which means it can lead users to see the dialog after notification pressed.

[Ash (ashley-richards)]

Hi Jin,
I have had a look into the steps you provided however I do not see any issues with the fix. It always presents the correct dialog chat window from push notification, the Touch utility panel both with the app being backgrounded and closed..

Did you preform the tests on Tablet?
Could you clarify what you mean by step e.? "..does not enter dialog window"?
Could you clarify what you mean below "More infomation here:"

Thanks

[Jin (jindallo)]

Hello Ash,

After .cache and .cache/QML/App/com.ubuntu.telegram* deleted,
I re-installed the app. on my phone and still has below findings:
    1. the app. is closed
    - leads user to the proper dialog window after notification pressed (OK)
    - then click back key on dialog window returns to main view but the chat is focused
      (this will be a regression of bug: 1576027)
    2. the app. is in the background as main view (AccountListPage)
    - No leads user to the dialog window, it keeps the page as main view (NG)
    3. the app. is in the background as the same dialog window (AccountDialogPage)
    - leads user to the proper dialog window after notification pressed (OK)
    4. the app. is in the background as the different dialog window (AccountDialogPage)
    - it shows a "Please select chat" broken page (NG)

Above "same" means in the dialog you are talking to the person who send you the messages,
and the "different" means the person who send you the messages is different with the one you are talking to.

review: Needs Fixing

[lp:~cellsoftware/telegram-app/1599030]

220. By Ash on 2016-07-19

Fixed issues Jin experianced

221. By Ash on 2016-07-19

Removed console logs

[Jin (jindallo)]

Problem solved,
the code looks good and verified pass locally on phone/tablet,
so I approve.

review: Approve

=== modified file 'telegram/app/qml/AccountDialogList.qml'
--- telegram/app/qml/AccountDialogList.qml	2016-06-27 09:40:33 +0000
+++ telegram/app/qml/AccountDialogList.qml	2016-07-19 15:18:28 +0000
@@ -41,9 +41,14 @@
 
     onDialogClosed: {
         if(mainView.width <= units.gu(80)) {
-            if (userTapBackHome == true) {
+            if (userTapBackHome) {
                 dialog_list.currentIndex = -1;
-                currentDialog = telegramObject.nullDialog;
+
+                if (!userTappedNotification) {
+                    currentDialog = telegramObject.nullDialog;
+                } else {
+                    userTappedNotification = false;
+                }
             } else {
                 userTapBackHome = true;
             }

=== modified file 'telegram/app/qml/AccountMessageList.qml'
--- telegram/app/qml/AccountMessageList.qml	2016-07-08 08:44:25 +0000
+++ telegram/app/qml/AccountMessageList.qml	2016-07-19 15:18:28 +0000
@@ -54,6 +54,7 @@
     onIsActiveChanged: {
         if( isActive )
             messages_model.setReaded()
+        userTappedNotification = false;
     }
 
     onCurrentDialogChanged: {

=== modified file 'telegram/app/qml/AccountPage.qml'
--- telegram/app/qml/AccountPage.qml	2016-06-24 14:42:41 +0000
+++ telegram/app/qml/AccountPage.qml	2016-07-19 15:18:28 +0000
@@ -19,8 +19,6 @@
     property alias telegramObject: dialogs.telegramObject
     property alias currentDialog: dialogs.currentDialog
 
-    property bool userTapBackHome: true
-
     signal openDialog(var dialogId)
     signal addParticipantRequest()
 

=== modified file 'telegram/app/qml/telegram.qml'
--- telegram/app/qml/telegram.qml	2016-06-08 13:58:16 +0000
+++ telegram/app/qml/telegram.qml	2016-07-19 15:18:28 +0000
@@ -54,6 +54,9 @@
     property var uri: undefined
     property int chatToOpen: 0
 
+    property bool userTapBackHome: true
+    property bool userTappedNotification: false
+
     signal error(int id, string errorCode, string errorText)
     signal pushLoaded()
     signal pushRegister(string token, string version)
@@ -121,11 +124,13 @@
                     // TODO: Temporarily open no chats if secret notification pressed.
                 } else {
                     console.info("Setting chat to open: " + chatId);
+                    userTappedNotification = true;
                     backToDialogsPage();
                     mainView.chatToOpen = chatId;
                     mainView.uri = undefined;
                 }
             case "launch": // no-i18n
+                //userTapBackHome = true;
                 // Nothing to do.
                 break;
             default: console.warn("Unmanaged URI! " + commands);