telephony-service

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

  1. account-with-emtpy-credentials
  2. Merge into trunk
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)
Reply
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve
Reply

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
=== modified file 'accounts/common/DynamicField.qml'
--- accounts/common/DynamicField.qml 2017-03-28 12:27:55 +0000
+++ accounts/common/DynamicField.qml 2017-03-28 12:27:55 +0000
@@ -28,6 +28,7 @@
28 property var model28 property var model
29 readonly property string value: status === Loader.Ready ? item.value : ""29 readonly property string value: status === Loader.Ready ? item.value : ""
30 readonly property bool isEmpty: status === Loader.Ready ? item.isEmpty : true30 readonly property bool isEmpty: status === Loader.Ready ? item.isEmpty : true
31 signal changed()
3132
32 Component {33 Component {
33 id: stringField34 id: stringField
3435
=== modified file 'accounts/common/NewAccountInterface.qml'
--- accounts/common/NewAccountInterface.qml 2017-03-28 12:27:55 +0000
+++ accounts/common/NewAccountInterface.qml 2017-03-28 12:27:55 +0000
@@ -117,7 +117,7 @@
117 account.updateDisplayName(formatDisplayName(inputFields))117 account.updateDisplayName(formatDisplayName(inputFields))
118118
119 serviceIM.updateSettings(settingsIM)119 serviceIM.updateSettings(settingsIM)
120 //serviceIM.credentials = creds120 serviceIM.credentials = creds
121 //serviceIM.updateServiceEnabled(true)121 //serviceIM.updateServiceEnabled(true)
122 }122 }
123123
@@ -178,13 +178,11 @@
178 var info = root.parseCrendentials()178 var info = root.parseCrendentials()
179 // save account179 // save account
180 account.updateDisplayName(info.userName)180 account.updateDisplayName(info.userName)
181 creds.userName = info.userName
181 if (root.hasCrendentials) {182 if (root.hasCrendentials) {
182 creds.userName = info.userName
183 creds.secret = info.password183 creds.secret = info.password
184 creds.sync()
185 } else {
186 continueAccountSave(null)
187 }184 }
185 creds.sync()
188 }186 }
189187
190 Column {188 Column {
@@ -289,10 +287,7 @@
289 caption: account.provider.id287 caption: account.provider.id
290 acl: "*" // untill later288 acl: "*" // untill later
291 storeSecret: true289 storeSecret: true
292 onCredentialsIdChanged: {290 onCredentialsIdChanged: root.credentialsStored()
293 console.debug("Credetials id changed")
294 root.credentialsStored()
295 }
296 }291 }
297292
298 // necessary to store settings on the "IM" service293 // necessary to store settings on the "IM" service

Subscribers

People subscribed via source and target branches

to all changes: