Merge lp://qastaging/~dobey/ubuntu-system-settings/token-deleted into lp://qastaging/ubuntu-system-settings

Proposed by dobey
Status: Merged
Approved by: Ken VanDine
Approved revision: 1316
Merged at revision: 1324
Proposed branch: lp://qastaging/~dobey/ubuntu-system-settings/token-deleted
Merge into: lp://qastaging/ubuntu-system-settings
Diff against target: 76 lines (+15/-0)
5 files modified
plugins/system-update/PageComponent.qml (+5/-0)
plugins/system-update/update_manager.cpp (+4/-0)
plugins/system-update/update_manager.h (+1/-0)
tests/plugins/system-update/fakessoservice.cpp (+2/-0)
tests/plugins/system-update/fakessoservice.h (+3/-0)
To merge this branch: bzr merge lp://qastaging/~dobey/ubuntu-system-settings/token-deleted
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+250202@code.qastaging.launchpad.net

Commit message

Handle the credentialsDeleted signal appropriately.

Description of the change

To test this is a bit difficult. You will need a U1 account on the phone, which is not added to the "unconfined" ACL. This can be done on the latest images, by manually deleting the ACL entry in the database after creating an account.

Close system settings.
Open the terminal app or use phablet-shell to perform the sqlite work.

First get the account ID:

# account-console list

That will print a list of account IDs and their provider. Take a note of the "ubuntuone" account, and use it as a parameter for the next command:

# account-console show <account-id>

Look for the "CredentialsId" field; let's call its value $ACCOUNT_ID.
Then you need to delete the entry from the ACL table in the signon database.

# sqlite3 .config/signond/signon.db
sqlite> delete from ACL where identity_id=$ACCOUNT_ID;
sqlite> delete from OWNER where identity_id=$ACCOUNT_ID;

Now, open system settings, and go to the Updates page. Without this branch, you should see the button requesting you to log in to U1 to get app updates. With this branch, the online accounts UI should pop up directly to the U1 page requesting to log in again.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Please include steps to manually test

review: Needs Information
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good and works as described, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches