Merge lp:~mardy/ubuntu-system-settings-online-accounts/ual-desktop into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Use ubuntu-app-launch to get apps' name and icon

[lp:~mardy/ubuntu-system-settings-online-accounts/ual-desktop]

422. By Alberto Mardegan on 2017-02-22

Use ubuntu-app-launch to retrieve the client application's name and icon

423. By Alberto Mardegan on 2017-03-08

Update UAL version

424. By Alberto Mardegan on 2017-03-08

fix version

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2017-01-26 06:46:36 +0000
+++ debian/changelog	2017-02-22 12:19:12 +0000
@@ -1,3 +1,11 @@
+ubuntu-system-settings-online-accounts (0.7+17.04.20170126-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/control:
+    - Bump dependency version on libmirclient-dev
+  * Remove calls to deprecated mir_wait_handle() function.
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 22 Feb 2017 11:29:04 +0300
+
 ubuntu-system-settings-online-accounts (0.7+17.04.20170126-0ubuntu1) zesty; urgency=medium
 
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2017-01-26 06:38:15 +0000
+++ debian/control	2017-02-22 12:19:12 +0000
@@ -8,12 +8,13 @@
                libaccounts-qt5-dev (>= 1.13),
                libapparmor-dev,
                libclick-0.4-dev,
-               libmirclient-dev (>= 0.14.0),
+               libmirclient-dev (>= 0.26.1),
                libnotify-dev,
                libqtdbusmock1-dev,
                libqtdbustest1-dev,
                libsignon-qt5-dev,
                libsystemsettings-dev (>= 0.1+13.10.20130806),
+               libubuntu-app-launch2-dev,
                qt5-default,
                qtbase5-dev (>= 5.4),
                qtdeclarative5-dev,

=== modified file 'online-accounts-service/mir-helper.cpp'
--- online-accounts-service/mir-helper.cpp	2014-11-25 13:18:32 +0000
+++ online-accounts-service/mir-helper.cpp	2017-02-22 12:19:12 +0000
@@ -44,7 +44,6 @@
 
     MirPromptSession *m_mirSession;
     pid_t m_initiatorPid;
-    QList<int> m_fds;
     mutable PromptSession *q_ptr;
 };
 
@@ -96,24 +95,16 @@
     delete d_ptr;
 }
 
-static void client_fd_callback(MirPromptSession *, size_t count,
-                               int const *fds, void *context)
-{
-    PromptSessionPrivate *priv = (PromptSessionPrivate *)context;
-    for (size_t i = 0; i < count; i++) {
-        priv->m_fds.append(fds[i]);
-    }
-}
-
 QString PromptSession::requestSocket()
 {
     Q_D(PromptSession);
 
-    d->m_fds.clear();
-    mir_wait_for(mir_prompt_session_new_fds_for_prompt_providers(
-        d->m_mirSession, 1, client_fd_callback, d));
-    if (!d->m_fds.isEmpty()) {
-        return QString("fd://%1").arg(d->m_fds[0]);
+    int fd = -1;
+    auto count =
+        mir_prompt_session_new_fds_for_prompt_providers_sync(d->m_mirSession,
+                                                             1, &fd);
+    if (count == 1 && fd >= 0) {
+        return QString("fd://%1").arg(fd);
     } else {
         return QString();
     }

=== modified file 'plugins/OnlineAccountsPlugin/OnlineAccountsPlugin.pro'
--- plugins/OnlineAccountsPlugin/OnlineAccountsPlugin.pro	2014-10-09 12:24:45 +0000
+++ plugins/OnlineAccountsPlugin/OnlineAccountsPlugin.pro	2017-02-22 12:19:12 +0000
@@ -14,9 +14,11 @@
 
 PKGCONFIG += \
     accounts-qt5 \
-    signon-plugins-common
+    signon-plugins-common \
+    ubuntu-app-launch-2
 
 QMAKE_CXXFLAGS += \
+    -fexceptions \
     -fvisibility=hidden
 DEFINES += BUILDING_ONLINE_ACCOUNTS_PLUGIN
 

=== modified file 'plugins/OnlineAccountsPlugin/application-manager.cpp'
--- plugins/OnlineAccountsPlugin/application-manager.cpp	2017-01-16 13:19:01 +0000
+++ plugins/OnlineAccountsPlugin/application-manager.cpp	2017-02-22 12:19:12 +0000
@@ -27,8 +27,12 @@
 #include <QFile>
 #include <QSettings>
 #include <QStandardPaths>
+#include <ubuntu-app-launch/appid.h>
+#include <ubuntu-app-launch/application.h>
+#include <ubuntu-app-launch/registry.h>
 
 using namespace OnlineAccountsUi;
+namespace ual = ubuntu::app_launch;
 
 ApplicationManager *ApplicationManager::m_instance = 0;
 
@@ -43,10 +47,15 @@
                                    const QString &profile) const;
     static QString stripVersion(const QString &appId);
     static QString displayId(const QString &appId);
+
+private:
+    friend class ApplicationManager;
+    std::shared_ptr<ual::Registry> m_registry;
 };
 } // namespace
 
-ApplicationManagerPrivate::ApplicationManagerPrivate()
+ApplicationManagerPrivate::ApplicationManagerPrivate():
+    m_registry(new ual::Registry)
 {
 }
 
@@ -173,8 +182,17 @@
     QVariantMap app;
     app.insert(QStringLiteral("id"), applicationId);
     app.insert(QStringLiteral("displayId"), d->displayId(applicationId));
-    app.insert(QStringLiteral("displayName"), application.displayName());
-    app.insert(QStringLiteral("icon"), application.iconName());
+    try {
+        auto appId = ual::AppID::find(d->m_registry, applicationId.toStdString());
+        auto appInfo = ual::Application::create(appId, d->m_registry)->info();
+        app.insert(QStringLiteral("displayName"), QString::fromStdString(appInfo->name()));
+        app.insert(QStringLiteral("icon"), QString::fromStdString(appInfo->iconPath()));
+    } catch (std::exception &e) {
+        qWarning() << "Reading app info failed, falling back to OA data:" << e.what();
+        app.insert(QStringLiteral("displayName"), application.displayName());
+        app.insert(QStringLiteral("icon"), application.iconName());
+    }
+
     /* The applicationMatchesProfile() test above ensures that either the peer
      * is unconfined, or the profile in the .application file matches the one
      * we see from our peer.

=== modified file 'plugins/module/ServiceItem.qml'
--- plugins/module/ServiceItem.qml	2016-02-12 13:30:25 +0000
+++ plugins/module/ServiceItem.qml	2017-02-22 12:19:12 +0000
@@ -40,10 +40,11 @@
         }
 
         delegate: ServiceItemBase {
-            text: model.displayName ? model.displayName : model.applicationId
-            subText: ApplicationManager.applicationInfo(model.applicationId, "unconfined").displayId
-            iconSource: model.iconName.indexOf("/") === 0 ?
-                model.iconName : "image://theme/" + model.iconName
+            property var appInfo: ApplicationManager.applicationInfo(model.applicationId, "unconfined")
+            text: appInfo.displayName ? appInfo.displayName : model.applicationId
+            subText: appInfo.displayId
+            iconSource: appInfo.icon.indexOf("/") === 0 ?
+                appInfo.icon : "image://theme/" + appInfo.icon
             checked: accountService.serviceEnabled
             onCheckedChanged: {
                 if (checked != accountService.serviceEnabled) {

=== modified file 'tests/plugin/tst_application_manager.pro'
--- tests/plugin/tst_application_manager.pro	2015-09-24 12:58:34 +0000
+++ tests/plugin/tst_application_manager.pro	2017-02-22 12:19:12 +0000
@@ -11,7 +11,11 @@
 QT -= gui
 
 PKGCONFIG += \
-    accounts-qt5
+    accounts-qt5 \
+    ubuntu-app-launch-2
+
+QMAKE_CXXFLAGS += \
+    -fexceptions
 
 DEFINES += \
     TEST_DATA_DIR=\\\"$${PWD}/data\\\"