Merge lp:~mardy/ubuntu-system-settings-online-accounts/confined-xdg-1656806 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Look for .application files in all XDG directories

Look for .application files in all XDG directories

[Renato Araujo Oliveira Filho (renatofilho)]

works nice.

review: Approve

=== modified file 'plugins/OnlineAccountsPlugin/application-manager.cpp'
--- plugins/OnlineAccountsPlugin/application-manager.cpp	2016-06-06 10:24:55 +0000
+++ plugins/OnlineAccountsPlugin/application-manager.cpp	2017-01-16 13:22:19 +0000
@@ -54,13 +54,17 @@
 {
     /* We need to load the XML file and look for the "profile" element. The
      * file lookup would become unnecessary if a domDocument() method were
-     * added to the Accounts::Application class. */
-    QString localShare =
-        QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-    QFile file(QString("%1/accounts/applications/%2.application").
-               arg(localShare).arg(applicationId));
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qDebug() << "file not found:" << file.fileName();
+     * added to the Accounts::Application class.
+     * https://gitlab.com/accounts-sso/libaccounts-qt/issues/2
+     */
+    QString subPath(QString("accounts/applications/%2.application").
+               arg(applicationId));
+    QString filePath =
+        QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
+    QFile file(filePath);
+    if (filePath.isEmpty() ||
+        !file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qDebug() << "Application file not found:" << file.fileName();
         /* libaccounts would fall back to looking into /usr/share/accounts/,
          * but we know that .click packages don't install files in there, and
          * currently the profile information is only attached to click
 
=== modified file 'tests/plugin/tst_application_manager.cpp'
--- tests/plugin/tst_application_manager.cpp	2015-09-24 12:58:34 +0000
+++ tests/plugin/tst_application_manager.cpp	2017-01-16 13:22:19 +0000
@@ -299,6 +299,37 @@
         "unconfined" <<
         "unconfined" <<
         (QStringList() << "cool-mail");
+
+    QTest::newRow("confined app, no profile") <<
+        "confinedApp" <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"confinedApp\">\n"
+        "  <description>My application 6</description>\n"
+        "  <services>\n"
+        "    <service id=\"cool-mail\">\n"
+        "      <description>Send email</description>\n"
+        "    </service>\n"
+        "  </services>\n"
+        "</application>" <<
+        "confinedApp" <<
+        "" <<
+        QStringList();
+
+    QTest::newRow("confined app, correct profile") <<
+        "confinedApp" <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"confinedApp\">\n"
+        "  <description>My application 6</description>\n"
+        "  <services>\n"
+        "    <service id=\"cool-mail\">\n"
+        "      <description>Send email</description>\n"
+        "    </service>\n"
+        "  </services>\n"
+        "  <profile>confinedAppProfile</profile>\n"
+        "</application>" <<
+        "confinedAppProfile" <<
+        "confinedAppProfile" <<
+        (QStringList() << "cool-mail");
 }
 
 void ApplicationManagerTest::testApplicationInfo()
@@ -316,9 +347,13 @@
     ApplicationManager manager;
 
     QVariantMap info = manager.applicationInfo(applicationId, inputProfile);
-    QCOMPARE(info.value("id").toString(), applicationId);
-    QCOMPARE(info.value("profile").toString(), expectedProfile);
-    QCOMPARE(info.value("services").toStringList().toSet(), services.toSet());
+    if (expectedProfile.isEmpty()) {
+        QVERIFY(info.isEmpty());
+    } else {
+        QCOMPARE(info.value("id").toString(), applicationId);
+        QCOMPARE(info.value("profile").toString(), expectedProfile);
+        QCOMPARE(info.value("services").toStringList().toSet(), services.toSet());
+    }
 }
 
 void ApplicationManagerTest::testAclAdd_data()