Merge lp:~lukas-kde/unity8/lockBeforeSuspend into lp:unity8

[Lukáš Tinkl]

Lock the session when putting the laptop into sleep

Lock the session when putting the laptop into sleep

Logind tells us it's preparing for sleep and we react to it; also our Suspend/Hibernate/HybridSleep DBUS methods emit the same signal (when invoked manually, e.g. using keyboard shortcuts)

* 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

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

N/A

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

N/A

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2397
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1205/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/744
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/744
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1617
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1565
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1565/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1565
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1565/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1565
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1565/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1565
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1565/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1565
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1565/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1565
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1565/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1205/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

Do we want this to be configurable? iirc on desktop we currently have an option to lock after suspend or not

review: Needs Information

[Lukáš Tinkl (lukas-kde)]

I'd say in the longterm yes, for now we don't have any such config and a sensible default value is to lock imo.

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
y

review: Approve

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.cpp'
--- plugins/Unity/Session/dbusunitysessionservice.cpp	2016-04-27 15:01:10 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.cpp	2016-05-12 17:11:24 +0000
@@ -227,11 +227,14 @@
     {
         if (!active) {
             setupSystemdInhibition();
+        } else {
+            Q_EMIT prepareForSleep();
         }
     }
 
 Q_SIGNALS:
     void screensaverActiveChanged(bool active);
+    void prepareForSleep();
 };
 
 Q_GLOBAL_STATIC(DBusUnitySessionServicePrivate, d)
@@ -245,6 +248,7 @@
         // ... and our Unlocked() signal to the logind's session Unlock() signal
         // (lightdm handles the unlocking by calling logind's Unlock method which in turn emits this signal we connect to)
         QDBusConnection::systemBus().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Unlock"), this, SIGNAL(Unlocked()));
+        connect(d, &DBusUnitySessionServicePrivate::prepareForSleep, this, &DBusUnitySessionService::PromptLock);
     } else {
         qWarning() << "Failed to connect to logind's session Lock/Unlock signals";
     }
@@ -390,16 +394,19 @@
 
 void DBusUnitySessionService::Suspend()
 {
+    PromptLock();
     d->makeLogin1Call(QStringLiteral("Suspend"), {false});
 }
 
 void DBusUnitySessionService::Hibernate()
 {
+    PromptLock();
     d->makeLogin1Call(QStringLiteral("Hibernate"), {false});
 }
 
 void DBusUnitySessionService::HybridSleep()
 {
+    PromptLock();
     d->makeLogin1Call(QStringLiteral("HybridSleep"), {false});
 }