Merge lp:~cellsoftware/telegram-app/1580050-fix into lp:telegram-app

Proposed by Ash
Status: Merged
Approved by: Jin
Approved revision: 216
Merged at revision: 214
Proposed branch: lp:~cellsoftware/telegram-app/1580050-fix
Merge into: lp:telegram-app
Diff against target: 20 lines (+6/-2)
1 file modified
telegram/app/qml/AccountListItem.qml (+6/-2)
To merge this branch: bzr merge lp:~cellsoftware/telegram-app/1580050-fix
Reviewer Review Type Date Requested Status
Jin (community) Approve
Review via email: mp+298223@code.launchpad.net

Description of the change

Fixes an issue where user would still see a blank screen whilst on the conversation details when session is terminated.

To post a comment you must log in.
213. By Ash

Removed unnecessary console log

Revision history for this message
Jin (jindallo) wrote :

Looks good to me,
I will approve if verified locally.

Revision history for this message
Jin (jindallo) wrote :

Still show a blank in testing,
the log here:
    ...
    [20160624 11:53:52.949 CST qml: auth error: SESSION_REVOKED
    [20160624 11:53:53.035 CST error_slt 401 "SESSION_REVOKED" "messagesGetDialogs"
    [20160624 11:53:53.105 CST qml: auth error: SESSION_REVOKED
    [20160624 11:53:53.106 CST error_slt 401 "SESSION_REVOKED" "updatesGetState"
    ...

And some inline comment made by me,
could please take a look,
thanks.

review: Needs Fixing
Revision history for this message
Jin (jindallo) wrote :

// inline comment added

Revision history for this message
Ash (ashley-richards) wrote :

> Still show a blank in testing,
> the log here:
> ...
> [20160624 11:53:52.949 CST qml: auth error: SESSION_REVOKED
> [20160624 11:53:53.035 CST error_slt 401 "SESSION_REVOKED"
> "messagesGetDialogs"
> [20160624 11:53:53.105 CST qml: auth error: SESSION_REVOKED
> [20160624 11:53:53.106 CST error_slt 401 "SESSION_REVOKED"
> "updatesGetState"
> ...
>
> And some inline comment made by me,
> could please take a look,
> thanks.

Thanks Jin. What were your steps to reproduce?

Revision history for this message
Jin (jindallo) wrote :

Hello Ash,

The same steps,
I keep in the AccountPage (main view),
then use the web-version Telegram to terminate all sessions,
as expected the app. need to jump back to IntroPage since you call showIntro() below,
but it doesn't, just a blank shown there.

214. By Ash

WIP - Updated potencial fix for the blank screen

215. By Ash

WIP - Put IF statement back in

216. By Paz Chauhan

.po and .pot files reverted

Revision history for this message
Jin (jindallo) wrote :

The code looks good,
I will approve after verified pass locally.

Revision history for this message
Jin (jindallo) wrote :

Issue resolved,
and verified pass from my local,
I approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'telegram/app/qml/AccountListItem.qml'
2--- telegram/app/qml/AccountListItem.qml 2016-06-24 09:56:08 +0000
3+++ telegram/app/qml/AccountListItem.qml 2016-06-29 15:28:21 +0000
4@@ -71,11 +71,15 @@
5 autoCleanUpMessages: true
6 autoAcceptEncrypted: true
7
8- onErrorSignal: {
9+ onErrorSignal:{
10 if (errorText === "SESSION_REVOKED" || errorText === "AUTH_KEY_UNREGISTERED") {
11- profiles.remove(telegram.phoneNumber);
12 telegram.logoutRequest = true;
13 telegram.authLogout();
14+
15+ profiles.remove(telegram.phoneNumber);
16+ if (profiles.count === 0)
17+ pageStack.primaryPageSource = null;
18+
19 showIntro();
20 }
21

Subscribers

People subscribed via source and target branches

to status/vote changes: