Merge lp:~marcustomlinson/unity-scopes-shell/oa_ui_policy-rtm into lp:unity-scopes-shell/rtm-14.09

[Marcus Tomlinson]

* Set UNITY_SCOPES_OA_UI_POLICY on entry to Scope::loginToAccount()
* Animate the loading bar on the scope while OA retrieves a token.

[Paweł Stołowski (stolowski)]

+1

review: Approve

[Paweł Stołowski (stolowski)]

LGTM

review: Approve

=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2014-10-22 15:48:29 +0000
+++ src/Unity/CMakeLists.txt	2014-12-12 16:38:14 +0000
@@ -61,7 +61,7 @@
     ${ONLINE_ACCOUNTS_CLIENT_LDFLAGS}
     )
 
-qt5_use_modules(Unity-qml Qml Gui DBus)
+qt5_use_modules(Unity-qml Qml Gui DBus Concurrent)
 
 # export the qmldir qmltypes and plugin files
 export_qmlfiles(Unity Unity)

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-10-15 09:59:13 +0000
+++ src/Unity/scope.cpp	2014-12-12 16:38:14 +0000
@@ -43,6 +43,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QLocale>
+#include <QtConcurrent>
 
 #include <libintl.h>
 
@@ -1242,7 +1243,11 @@
 
 bool Scope::loginToAccount(QString const& service_name, QString const& service_type, QString const& provider_name)
 {
-    bool service_enabled = false;
+    // Set the UNITY_SCOPES_OA_UI_POLICY environment variable here so that OnlineAccountClient knows we're
+    // calling it from the shell (hence it will use the default UI policy when talking to libsignon).
+    setenv("UNITY_SCOPES_OA_UI_POLICY", "1", 0);
+
+    QFuture<bool> service_enabled_future = QtConcurrent::run([&]
     {
         // Check if at least one account has the specified service enabled
         scopes::OnlineAccountClient oa_client(service_name.toStdString(), service_type.toStdString(), provider_name.toStdString());
@@ -1251,11 +1256,25 @@
         {
             if (status.service_enabled)
             {
-                service_enabled = true;
-                break;
+                return true;
             }
         }
-    }
+        return false;
+    });
+    QFutureWatcher<bool> future_watcher;
+    future_watcher.setFuture(service_enabled_future);
+
+    // Set SearchInProgress so that the loading bar animates while we waiting for the token to be issued.
+    setSearchInProgress(true);
+
+    QEventLoop loop;
+    connect(&future_watcher, &QFutureWatcher<void>::finished, &loop, &QEventLoop::quit);
+    loop.exec(QEventLoop::ProcessEventsFlag::ExcludeUserInputEvents);
+
+    // Unset SearchInProgress to stop the loading bar animation.
+    setSearchInProgress(false);
+
+    bool service_enabled = service_enabled_future.result();
 
     // Start the signon UI if no enabled services were found
     if (!service_enabled)