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

[Alberto Mardegan]

Fix desktop file name for scopes: they use their short app ID

Scopes use their short app ID as desktop file name

Click for testing: mardy.it/archivos/com.canonical.scopes.weibo_0.9.5_armhf.click

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

367. By Alberto Mardegan on 2016-06-29

update from trunk

Read time from symlink file, not target (LP: #1596478)

[Alberto Mardegan (mardy)]

review: Approve

[Alberto Mardegan (mardy)]

review: Approve

=== modified file 'click-hooks/accounts.cpp'
--- click-hooks/accounts.cpp	2016-06-28 09:04:28 +0000
+++ click-hooks/accounts.cpp	2016-06-29 09:04:39 +0000
@@ -125,6 +125,7 @@
     QString m_appId;
     QString m_shortAppId;
     QString m_trDomain;
+    bool m_isScope;
     bool m_isValid;
 };
 
@@ -134,6 +135,7 @@
     m_hookFileInfo(hookFileInfo),
     m_appId(appId),
     m_shortAppId(shortAppId),
+    m_isScope(false),
     m_isValid(false)
 {
     QFile file(hookFileInfo.filePath());
@@ -145,6 +147,7 @@
         m_services = mainObject.value("services").toArray();
         m_trDomain = mainObject.value("translations").toString();
         m_plugin = mainObject.value("plugin").toObject();
+        m_isScope = mainObject.value("scope").toBool();
         m_isValid = !m_services.isEmpty() || !m_plugin.isEmpty();
 
         m_packageDir = findPackageDir(appId);
@@ -467,7 +470,7 @@
 {
     QDomElement root = doc.documentElement();
     QDomElement elem = doc.createElement(QStringLiteral("desktop-entry"));
-    elem.appendChild(doc.createTextNode(m_appId));
+    elem.appendChild(doc.createTextNode(m_isScope ? m_shortAppId : m_appId));
     root.appendChild(elem);
 }
 

=== modified file 'tests/click-hooks/tst_online_accounts_hooks2.cpp'
--- tests/click-hooks/tst_online_accounts_hooks2.cpp	2015-11-30 09:54:01 +0000
+++ tests/click-hooks/tst_online_accounts_hooks2.cpp	2016-06-29 09:04:39 +0000
@@ -581,6 +581,42 @@
         "}" <<
         package <<
         files;
+
+    files.clear();
+    files["applications/com.ubuntu.test_MyScope.application"] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        "<!--this file is auto-generated by online-accounts-hooks2; do not modify-->\n"
+        "<application id=\"com.ubuntu.test_MyScope\">\n"
+        "  <profile>com.ubuntu.test_MyScope_0.3</profile>\n"
+        "  <package-dir>/tmp/hooks-test2/package</package-dir>\n"
+        "  <desktop-entry>com.ubuntu.test_MyScope</desktop-entry>\n"
+        "  <services>\n"
+        "    <service id=\"com.ubuntu.test_MyScope_google\">\n"
+        "      <description>.</description>\n"
+        "    </service>\n"
+        "  </services>\n"
+        "</application>\n";
+    files["services/com.ubuntu.test_MyScope_google.service"] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        "<!--this file is auto-generated by online-accounts-hooks2; do not modify-->\n"
+        "<service id=\"com.ubuntu.test_MyScope_google\">\n"
+        "  <type>com.ubuntu.test_MyScope</type>\n"
+        "  <provider>google</provider>\n"
+        "  <name>.</name>\n"
+        "  <profile>com.ubuntu.test_MyScope_0.3</profile>\n"
+        "</service>\n";
+    QTest::newRow("minimal") <<
+        "com.ubuntu.test_MyScope_0.3.accounts" <<
+        "{"
+        "  \"scope\": true,"
+        "  \"services\": ["
+        "    {"
+        "      \"provider\": \"google\""
+        "    }"
+        "  ]"
+        "}" <<
+        package <<
+        files;
 }
 
 void OnlineAccountsHooksTest::testValidHooks()