Merge lp:~dbarth/ubuntu-system-settings/rtm-fix-1378678 into lp:ubuntu-system-settings/rtm-14.09

[David Barth]

cherry picking the fix for bug #1378678 (aka bug #1413655), ie prompting the user when older u1 accounts are deleted by the system

cherry picking the fix for bug #1378678 (aka bug #1413655), ie prompting the user when older u1 accounts are deleted by the system

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/67
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/45
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18375

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/66/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

That's a cherry pick from trunk r1324, looks fine to me, thanks

review: Approve

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

998. By David Barth on 2015-02-26

cherry picking the fix for bug #1378678, ie prompting the user when older u1 accounts are deleted by the system

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-01-30 18:36:21 +0000
+++ plugins/system-update/PageComponent.qml	2015-02-26 10:50:36 +0000
@@ -199,6 +199,11 @@
             credentialsNotification.visible = true;
         }
 
+        onCredentialsDeleted: {
+            credentialsNotification.visible = false;
+            uoaConfig.exec();
+        }
+
         onSystemUpdateDownloaded: {
             root.installAll = false;
         }

=== modified file 'plugins/system-update/update_manager.cpp'
--- plugins/system-update/update_manager.cpp	2014-12-16 15:38:34 +0000
+++ plugins/system-update/update_manager.cpp	2015-02-26 10:50:36 +0000
@@ -63,6 +63,10 @@
                      this, SIGNAL(credentialsNotFound()));
     QObject::connect(&m_service, SIGNAL(credentialsNotFound()),
                   this, SLOT(clickUpdateNotAvailable()));
+    QObject::connect(&m_service, SIGNAL(credentialsDeleted()),
+                     this, SIGNAL(credentialsDeleted()));
+    QObject::connect(&m_service, SIGNAL(credentialsDeleted()),
+                  this, SLOT(clickUpdateNotAvailable()));
     // PROCESS
     QObject::connect(&m_process, SIGNAL(finished(int)),
                   this, SLOT(processOutput()));

=== modified file 'plugins/system-update/update_manager.h'
--- plugins/system-update/update_manager.h	2014-12-10 14:25:19 +0000
+++ plugins/system-update/update_manager.h	2015-02-26 10:50:36 +0000
@@ -68,6 +68,7 @@
     void modelChanged();
     void updatesNotFound();
     void credentialsNotFound();
+    void credentialsDeleted();
     void updateAvailableFound(bool downloading);
     void errorFound();
     void networkError();

=== modified file 'tests/plugins/system-update/fakessoservice.cpp'
--- tests/plugins/system-update/fakessoservice.cpp	2014-05-07 15:37:22 +0000
+++ tests/plugins/system-update/fakessoservice.cpp	2015-02-26 10:50:36 +0000
@@ -13,6 +13,8 @@
     if(m_validCredentials) {
         Token token("token_key", "token_secret", "consumer_key", "consumer_secret");
         emit this->credentialsFound(token);
+    } else if (m_deletedCredentials) {
+        emit this->credentialsDeleted();
     } else {
         emit this->credentialsNotFound();
     }

=== modified file 'tests/plugins/system-update/fakessoservice.h'
--- tests/plugins/system-update/fakessoservice.h	2014-05-05 18:18:37 +0000
+++ tests/plugins/system-update/fakessoservice.h	2015-02-26 10:50:36 +0000
@@ -17,13 +17,16 @@
     void getCredentials();
 
     void setValidCredentials(bool value) { m_validCredentials = value; }
+    void setDeletedCredentials(bool value) { m_deletedCredentials = value; }
     
 signals:
     void credentialsFound(const Token&);
     void credentialsNotFound();
+    void credentialsDeleted();
 
 private:
     bool m_validCredentials;
+    bool m_deletedCredentials;
 };
 
 }