Merge lp:~phablet-team/telephony-service/account-with-emtpy-credentials into lp:telephony-service

Proposed by Renato Araujo Oliveira Filho
Status: Approved
Approved by: Gustavo Pichorim Boiko
Approved revision: 1255
Proposed branch: lp:~phablet-team/telephony-service/account-with-emtpy-credentials
Merge into: lp:telephony-service
Prerequisite: lp:~phablet-team/telephony-service/add-gdb-to-tests
Diff against target: 52 lines (+5/-9)
2 files modified
accounts/common/DynamicField.qml (+1/-0)
accounts/common/NewAccountInterface.qml (+4/-9)
To merge this branch: bzr merge lp:~phablet-team/telephony-service/account-with-emtpy-credentials
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
system-apps-ci-bot continuous-integration Approve
Review via email: mp+321172@code.launchpad.net

Commit message

[accounts] Store a empty credentials to avoid accounts screen to get stuck when called from app.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:1255
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/4/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2360
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2360
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2177
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2177
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2177
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2177
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2177
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2177/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2177
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2177/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/4/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Unmerged revisions

1255. By Renato Araujo Oliveira Filho

[accounts] Store a empty credentials to avoid accounts screen to get stuck when called from app.

1254. By Tiago Salem Herrmann

add gdb as build-dep

1253. By Tiago Salem Herrmann

add gdb to tests

1252. By Gustavo Pichorim Boiko

Disable PA on tests.

1251. By Gustavo Pichorim Boiko

Monitor app and disconnect/connect accounts when appropriate.

1250. By Gustavo Pichorim Boiko

Implemented contact match by online accounts (IRC).

1249. By Gustavo Pichorim Boiko

Export startChat to QML.

1248. By Gustavo Pichorim Boiko

Expose the account parameters to QML

1247. By Gustavo Pichorim Boiko

Add ParticipantsModel

1246. By Gustavo Pichorim Boiko

- Multiple performance improvements on Roles Interfaces and ContactWatcher
- Changed upstart job to also launch telephony-service-indicator on desktop

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'accounts/common/DynamicField.qml'
2--- accounts/common/DynamicField.qml 2017-03-28 12:27:55 +0000
3+++ accounts/common/DynamicField.qml 2017-03-28 12:27:55 +0000
4@@ -28,6 +28,7 @@
5 property var model
6 readonly property string value: status === Loader.Ready ? item.value : ""
7 readonly property bool isEmpty: status === Loader.Ready ? item.isEmpty : true
8+ signal changed()
9
10 Component {
11 id: stringField
12
13=== modified file 'accounts/common/NewAccountInterface.qml'
14--- accounts/common/NewAccountInterface.qml 2017-03-28 12:27:55 +0000
15+++ accounts/common/NewAccountInterface.qml 2017-03-28 12:27:55 +0000
16@@ -117,7 +117,7 @@
17 account.updateDisplayName(formatDisplayName(inputFields))
18
19 serviceIM.updateSettings(settingsIM)
20- //serviceIM.credentials = creds
21+ serviceIM.credentials = creds
22 //serviceIM.updateServiceEnabled(true)
23 }
24
25@@ -178,13 +178,11 @@
26 var info = root.parseCrendentials()
27 // save account
28 account.updateDisplayName(info.userName)
29+ creds.userName = info.userName
30 if (root.hasCrendentials) {
31- creds.userName = info.userName
32 creds.secret = info.password
33- creds.sync()
34- } else {
35- continueAccountSave(null)
36 }
37+ creds.sync()
38 }
39
40 Column {
41@@ -289,10 +287,7 @@
42 caption: account.provider.id
43 acl: "*" // untill later
44 storeSecret: true
45- onCredentialsIdChanged: {
46- console.debug("Credetials id changed")
47- root.credentialsStored()
48- }
49+ onCredentialsIdChanged: root.credentialsStored()
50 }
51
52 // necessary to store settings on the "IM" service

Subscribers

People subscribed via source and target branches

to all changes: