Merge into trunk : click-notifications : Code : ubuntu-system-settings

Status:

Merged

Approved by:

Sebastien Bacher on 2014-05-13

Approved revision:

698

Merged at revision:

703

Proposed branch:

lp:~diegosarmentero/ubuntu-system-settings/click-notifications

Merge into:

lp:ubuntu-system-settings

Diff against target:

161 lines (+103/-13)

2 files modified

plugins/system-update/plugin/CMakeLists.txt (+8/-4)
plugins/system-update/plugin/update-plugin.cpp (+95/-9)

To merge this branch:

bzr merge lp:~diegosarmentero/ubuntu-system-settings/click-notifications

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)		2014-05-07	Approve on 2014-05-13
PS Jenkins bot	continuous-integration		Approve on 2014-05-12
Review via email: mp+218644@code.launchpad.net

Commit message

- Show click updates notifications in main page.

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-05-07:

#

Thanks, I've built that one but the settings happen fails to start with it

system-settings: symbol lookup error: /usr/lib/i386-linux-gnu/ubuntu-system-settings/libupdate-plugin.so: undefined symbol: _ZN12UpdatePlugin13UpdateManagerC1EP7QObject

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-07:

#

FAILED: Continuous integration, rev:691
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/821/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/69
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/10
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/578
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/175
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/175/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6898
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/88
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/88/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Diego Sarmentero (diegosarmentero) wrote on 2014-05-08:

#

> Thanks, I've built that one but the settings happen fails to start with it
>
> system-settings: symbol lookup error: /usr/lib/i386-linux-gnu/ubuntu-system-
> settings/libupdate-plugin.so: undefined symbol:
> _ZN12UpdatePlugin13UpdateManagerC1EP7QObject

Have you installed both of these files?
libsystemsettings1_0.1+14.04.20140411-0ubuntu2_armhf.deb
ubuntu-system-settings_0.1+14.04.20140411-0ubuntu2_armhf.deb

I'm testing it in the phone installing those and it works.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-08:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-12:

#

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

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-05-13:

#

current version works fine for me, thanks

review: Approve

 === modified file 'plugins/system-update/plugin/CMakeLists.txt'
 --- plugins/system-update/plugin/CMakeLists.txt	2014-01-31 15:07:01 +0000
 +++ plugins/system-update/plugin/CMakeLists.txt	2014-05-12 14:36:49 +0000
@@ -1,9 +1,13 @@
++SET (CMAKE_AUTOMOC ON)
  include_directories(${CMAKE_CURRENT_BINARY_DIR})
--add_definitions(-DQT_NO_KEYWORDS)
++add_library(update-plugin SHARED update-plugin.h update-plugin.cpp ../update.cpp ../update.h
++../system_update.cpp ../system_update.h ../network/network.h ../network/network.cpp)
--add_library(update-plugin SHARED update-plugin.h update-plugin.cpp ../update.cpp ../update.h ../system_update.cpp ../system_update.h)
--qt5_use_modules(update-plugin Core Qml Quick DBus)
++qt5_use_modules(update-plugin Core Qml Quick Network DBus)
  include_directories(/usr/include/apt-pkg/)
--target_link_libraries(update-plugin SystemSettings apt-pkg)
++pkg_check_modules(UBUNTUONEAUTH REQUIRED ubuntuoneauth-2.0)
++add_definitions(${UBUNTUONEAUTH_CFLAGS} ${UBUNTUONEAUTH_CFLAGS_OTHER})
++
++target_link_libraries(update-plugin SystemSettings apt-pkg ${UBUNTUONEAUTH_LDFLAGS})
  install(TARGETS update-plugin DESTINATION ${PLUGIN_MODULE_DIR})
 === modified file 'plugins/system-update/plugin/update-plugin.cpp'
 --- plugins/system-update/plugin/update-plugin.cpp	2014-02-20 12:22:22 +0000
 +++ plugins/system-update/plugin/update-plugin.cpp	2014-05-12 14:36:49 +0000
@@ -24,9 +24,20 @@
  #include <QStringList>
  #include <SystemSettings/ItemBase>
++#include <token.h>
++#include <ssoservice.h>
++#include <QProcess>
++#include <QJsonDocument>
++#include <QJsonObject>
++#include <QJsonArray>
++#include <QJsonValue>
++#include <QHash>
  #include "../system_update.h"
++#include "../update.h"
++#include "../network/network.h"
  using namespace SystemSettings;
++using namespace UbuntuOne;
  using namespace UpdatePlugin;
  class UpdateItem: public ItemBase
@@ -38,11 +49,34 @@
      void setVisibility(bool visible);
      ~UpdateItem();
++Q_SIGNALS:
++    void checkFinished();
++    void modelChanged();
++    void updatesNotFound();
++    void credentialsNotFound();
++    void updateAvailableFound(bool downloading);
++    void errorFound();
++    void downloadModeChanged();
++    void systemUpdateDownloaded();
++    void updateProcessFailed(QString message);
++    void systemUpdateFailed(int consecutiveFailureCount, QString lastReason);
++
  private Q_SLOTS:
--    void changeVisibility(const QString& package, Update* update);
++    void changeVisibility(const QString&, Update*);
++    void systemUpdatePaused(int value);
++    void processOutput();
++    void processUpdates();
++    void downloadUrlObtained(const QString &packagename, const QString &url);
++    void handleCredentialsFound(Token token);
++    void clickTokenReceived(Update *app, const QString &clickToken);
  private:
      SystemUpdate m_systemUpdate;
++    Token m_token;
++    UpdatePlugin::Network m_network;
++    QProcess m_process;
++    SSOService m_service;
++    QHash<QString, Update*> m_apps;
  };
  UpdateItem::UpdateItem(const QVariantMap &staticData, QObject *parent):
@@ -50,18 +84,70 @@
      m_systemUpdate(this)
+ {
      setVisibility(false);
++    // SYSTEM UPDATE
      QObject::connect(&m_systemUpdate, SIGNAL(updateAvailable(const QString&, Update*)),
                    this, SLOT(changeVisibility(const QString&, Update*)));
++    // SSO SERVICE
++    QObject::connect(&m_service, SIGNAL(credentialsFound(const Token&)),
++                     this, SLOT(handleCredentialsFound(Token)));
++    // PROCESS
++    QObject::connect(&m_process, SIGNAL(finished(int)),
++                  this, SLOT(processOutput()));
++    // NETWORK
++    QObject::connect(&m_network, SIGNAL(updatesFound()),
++                  this, SLOT(processUpdates()));
++
      m_systemUpdate.checkForUpdate();
--}
--
--void UpdateItem::changeVisibility(const QString& package, Update* update)
--{
--    Q_UNUSED(package);
--    if (update->updateRequired()) {
--        setVisibility(true);
--    }
++    m_service.getCredentials();
++}
++
++void UpdateItem::handleCredentialsFound(Token token)
++{
++    m_token = token;
++    QStringList args("list");
++    args << "--manifest";
++    QString command("click");
++    m_process.start(command, args);
++}
++
++void UpdateItem::processOutput()
++{
++    QString output(m_process.readAllStandardOutput());
++
++    QJsonDocument document = QJsonDocument::fromJson(output.toUtf8());
++
++    QJsonArray array = document.array();
++
++    int i;
++    for (i = 0; i < array.size(); i++) {
++        QJsonObject object = array.at(i).toObject();
++        QString name = object.value("name").toString();
++        QString title = object.value("title").toString();
++        QString version = object.value("version").toString();
++        Update *app = new Update();
++        app->initializeApplication(name, title, version);
++        m_apps[app->getPackageName()] = app;
++    }
++
++    m_network.checkForNewVersions(m_apps);
++}
++
++
++void UpdateItem::processUpdates()
++{
++    foreach (QString id, m_apps.keys()) {
++        Update *app = m_apps.value(id);
++        if(app->updateRequired()) {
++            setVisibility(true);
++            break;
++        }
++    }
++}
++
++void UpdateItem::changeVisibility(const QString&, Update*)
++{
++    setVisibility(true);
+ }
  void UpdateItem::setVisibility(bool visible)

ubuntu-system-settings

Merge lp:~diegosarmentero/ubuntu-system-settings/click-notifications into lp:ubuntu-system-settings

Commit message

Description of the change

Preview Diff

Subscribers