Merge lp:~mterry/unity8/show-greeter-dbus into lp:unity8

[Michael Terry]

Allow the session to bring up the greeter/lockscreen over DBus. The emergency dialer will need this support in order to cancel bringing it up.

Allow the session to bring up the greeter/lockscreen over DBus. The emergency dialer will need this support in order to cancel bringing it up.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 - No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 - Yes

 * Did you make sure that your branch does not contain spurious tags?
 - Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 - NA

 * If you changed the UI, has there been a design review?
 -NA

[lp:~mterry/unity8/show-greeter-dbus]

981. By Michael Terry on 2014-07-11

Merge from is-active

Unmerged revisions

=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2014-06-11 15:36:51 +0000
+++ plugins/LightDM/CMakeLists.txt	2014-06-29 22:42:44 +0000
@@ -15,6 +15,7 @@
 
 set(QMLPLUGIN_SRC
     ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
+    DBusGreeter.cpp
     DBusGreeterList.cpp
     Greeter.cpp
     plugin.cpp

=== added file 'plugins/LightDM/DBusGreeter.cpp'
--- plugins/LightDM/DBusGreeter.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/DBusGreeter.cpp	2014-06-29 22:42:44 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "DBusGreeter.h"
+#include "Greeter.h"
+
+#include <QDBusMessage>
+#include <QStringList>
+
+DBusGreeter::DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path)
+ : QObject(greeter),
+   m_greeter(greeter),
+   m_connection(connection),
+   m_path(path)
+{
+    connect(m_greeter, SIGNAL(isActiveChanged()), this, SLOT(isActiveChangedHandler()));
+}
+
+bool DBusGreeter::isActive() const
+{
+    return m_greeter->isActive();
+}
+
+void DBusGreeter::ShowGreeter()
+{
+    return Q_EMIT m_greeter->showGreeter();
+}
+
+void DBusGreeter::isActiveChangedHandler()
+{
+    notifyPropertyChanged("IsActive", isActive());
+    Q_EMIT isActiveChanged();
+}
+
+// Manually emit a PropertiesChanged signal over DBus, because QtDBus
+// doesn't do it for us on Q_PROPERTIES, oddly enough.
+void DBusGreeter::notifyPropertyChanged(const QString& propertyName, const QVariant &value)
+{
+    QDBusMessage message;
+    QVariantMap changedProps;
+
+    changedProps.insert(propertyName, value);
+
+    message = QDBusMessage::createSignal(m_path,
+                                         "org.freedesktop.DBus.Properties",
+                                         "PropertiesChanged");
+    message << "com.canonical.UnityGreeter";
+    message << changedProps;
+    message << QStringList();
+
+    m_connection.send(message);
+}

=== added file 'plugins/LightDM/DBusGreeter.h'
--- plugins/LightDM/DBusGreeter.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/DBusGreeter.h	2014-06-29 22:42:44 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_DBUSGREETER_H
+#define UNITY_DBUSGREETER_H
+
+#include <QDBusConnection>
+#include <QObject>
+
+class Greeter;
+class QDBusInterface;
+
+/** This is an internal class used to talk with the indicators.
+  */
+
+class DBusGreeter : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.UnityGreeter")
+
+    Q_PROPERTY(bool IsActive READ isActive NOTIFY isActiveChanged) // since 14.10
+
+public:
+    explicit DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path);
+
+    bool isActive() const;
+    Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
+
+Q_SIGNALS:
+    void isActiveChanged();
+
+private Q_SLOTS:
+    void isActiveChangedHandler();
+    void notifyPropertyChanged(const QString &propertyName, const QVariant &value);
+
+private:
+    Greeter *m_greeter;
+    QDBusConnection m_connection;
+    QString m_path;
+};
+
+#endif

=== modified file 'plugins/LightDM/Greeter.cpp'
--- plugins/LightDM/Greeter.cpp	2014-06-11 15:36:51 +0000
+++ plugins/LightDM/Greeter.cpp	2014-06-29 22:42:44 +0000
@@ -25,6 +25,7 @@
     explicit GreeterPrivate(Greeter *parent);
 
     QLightDM::Greeter *m_greeter;
+    bool m_active;
     bool wasPrompted;
     bool promptless;
 
@@ -38,6 +39,7 @@
 
 GreeterPrivate::GreeterPrivate(Greeter* parent)
   : m_greeter(new QLightDM::Greeter(parent)),
+    m_active(false),
     wasPrompted(false),
     promptless(false),
     q_ptr(parent)
@@ -60,6 +62,21 @@
     d->m_greeter->connectSync();
 }
 
+bool Greeter::isActive() const
+{
+    Q_D(const Greeter);
+    return d->m_active;
+}
+
+void Greeter::setIsActive(bool active)
+{
+    Q_D(Greeter);
+    if (d->m_active != active) {
+        d->m_active = active;
+        Q_EMIT isActiveChanged();
+    }
+}
+
 bool Greeter::isAuthenticated() const
 {
     Q_D(const Greeter);

=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2014-06-11 15:36:51 +0000
+++ plugins/LightDM/Greeter.h	2014-06-29 22:42:44 +0000
@@ -34,6 +34,7 @@
 {
     Q_OBJECT
 
+    Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
     Q_PROPERTY(bool authenticated READ isAuthenticated)
     Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
     Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
@@ -41,6 +42,7 @@
 public:
     explicit Greeter(QObject* parent=0);
 
+    bool isActive() const;
     bool isAuthenticated() const;
     QString authenticationUser() const;
     bool promptless() const;
@@ -49,13 +51,16 @@
     void authenticate(const QString &username=QString());
     void respond(const QString &response);
     bool startSessionSync(const QString &session=QString());
+    void setIsActive(bool isActive);
 
 Q_SIGNALS:
     void showMessage(const QString &text, bool isError);
     void showPrompt(const QString &text, bool isSecret);
     void authenticationComplete();
     void authenticationUserChanged(const QString &user);
+    void isActiveChanged();
     void promptlessChanged();
+    void showGreeter();
 
     // This signal is emitted by external agents like indicators, and the UI
     // should switch to this user if possible.

=== modified file 'plugins/LightDM/plugin.cpp'
--- plugins/LightDM/plugin.cpp	2014-06-11 15:36:51 +0000
+++ plugins/LightDM/plugin.cpp	2014-06-29 22:42:44 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "plugin.h"
+#include "DBusGreeter.h"
 #include "DBusGreeterList.h"
 #include "Greeter.h"
 #include "UsersModel.h"
@@ -39,6 +40,8 @@
 
     Greeter *greeter = new Greeter();
     QDBusConnection connection = QDBusConnection::sessionBus();
+    DBusGreeter *root = new DBusGreeter(greeter, connection, "/");
+    connection.registerObject("/", root, QDBusConnection::ExportScriptableContents);
     DBusGreeterList *list = new DBusGreeterList(greeter, connection, GREETER_LIST_DBUS_PATH);
     connection.registerObject(GREETER_LIST_DBUS_PATH, list, QDBusConnection::ExportScriptableContents);
     connection.registerService(GREETER_DBUS_SERVICE);

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-06-24 16:27:07 +0000
+++ qml/Shell.qml	2014-06-29 22:42:44 +0000
@@ -348,6 +348,8 @@
     Connections {
         target: LightDM.Greeter
 
+        onShowGreeter: greeter.show()
+
         onShowPrompt: {
             if (LightDM.Users.count == 1) {
                 // TODO: There's no better way for now to determine if its a PIN or a passphrase.
@@ -373,6 +375,12 @@
         }
     }
 
+    Binding {
+        target: LightDM.Greeter
+        property: "active"
+        value: greeter.shown || lockscreen.shown
+    }
+
     Rectangle {
         anchors.fill: parent
         color: "black"
@@ -412,6 +420,9 @@
             onShownChanged: {
                 if (shown) {
                     lockscreen.reset();
+                    if (!LightDM.Greeter.promptless) {
+                       lockscreen.show();
+                    }
                     // If there is only one user, we start authenticating with that one here.
                     // If there are more users, the Greeter will handle that
                     if (LightDM.Users.count == 1) {

=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	2014-06-11 15:36:51 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	2014-06-29 22:42:44 +0000
@@ -18,6 +18,7 @@
 )
 
 set(QMLPLUGIN_SRC
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/plugin.cpp

=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	2014-06-11 15:36:51 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	2014-06-29 22:42:44 +0000
@@ -19,7 +19,7 @@
 
 add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_custom_target(testLightDMDBus dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
+add_custom_target(testLightDMDBus xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
 add_dependencies(testLightDMDBus test-lightdm-dbus)
 
 add_dependencies(qmluitests testLightDMDBus)

=== modified file 'tests/plugins/LightDM/dbus.cpp'
--- tests/plugins/LightDM/dbus.cpp	2013-12-03 16:55:03 +0000
+++ tests/plugins/LightDM/dbus.cpp	2014-06-29 22:42:44 +0000
@@ -40,6 +40,13 @@
         // to watch.
         QDBusConnection::sessionBus().connect(
             "com.canonical.UnityGreeter",
+            "/",
+            "org.freedesktop.DBus.Properties",
+            "PropertiesChanged",
+            this,
+            SIGNAL(PropertiesChangedRelay(const QString&, const QVariantMap&, const QStringList&)));
+        QDBusConnection::sessionBus().connect(
+            "com.canonical.UnityGreeter",
             "/list",
             "org.freedesktop.DBus.Properties",
             "PropertiesChanged",
@@ -57,6 +64,12 @@
         view->show();
         QTest::qWaitForWindowExposed(view);
 
+        dbusMain = new QDBusInterface("com.canonical.UnityGreeter",
+                                      "/",
+                                      "com.canonical.UnityGreeter",
+                                      QDBusConnection::sessionBus(), view);
+        QVERIFY(dbusMain->isValid());
+
         dbusList = new QDBusInterface("com.canonical.UnityGreeter",
                                       "/list",
                                       "com.canonical.UnityGreeter.List",
@@ -155,9 +168,36 @@
         QVERIFY(arguments.at(1).toMap()["EntryIsLocked"] == false);
     }
 
+    void testIsActive()
+    {
+        QVERIFY(!greeter->isActive());
+        QVERIFY(!dbusMain->property("IsActive").toBool());
+
+        QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));
+        greeter->setIsActive(true);
+        spy.wait();
+
+        QVERIFY(greeter->isActive());
+        QVERIFY(dbusMain->property("IsActive").toBool());
+
+        QCOMPARE(spy.count(), 1);
+        QList<QVariant> arguments = spy.takeFirst();
+        QCOMPARE(arguments.at(0).toString(), QString("com.canonical.UnityGreeter"));
+        QVERIFY(arguments.at(1).toMap().contains("IsActive"));
+        QVERIFY(arguments.at(1).toMap()["IsActive"].toBool());
+    }
+
+    void testShowGreeter()
+    {
+        // Just confirm the call exists and doesn't fail
+        QDBusReply<void> reply = dbusMain->call("ShowGreeter");
+        QVERIFY(reply.isValid());
+    }
+
 private:
     QQuickView *view;
     Greeter *greeter;
+    QDBusInterface *dbusMain;
     QDBusInterface *dbusList;
 };
 

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-06-17 03:52:58 +0000
+++ tests/qmltests/tst_Shell.qml	2014-06-29 22:42:44 +0000
@@ -20,6 +20,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import GSettings 1.0
+import LightDM 0.1 as LightDM
 import Unity.Application 0.1
 import Unity.Test 0.1 as UT
 import Powerd 0.1
@@ -556,5 +557,12 @@
             tryCompare(greeter, "showProgress", 0)
             waitUntilApplicationWindowIsFullyVisible()
         }
+
+        function test_showGreeterDBusCall() {
+            var greeter = findChild(shell, "greeter")
+            tryCompare(greeter, "showProgress", 0)
+            LightDM.Greeter.showGreeter()
+            tryCompare(greeter, "showProgress", 1)
+        }
     }
 }