From 19506296905cddb9a286921a0d56ab22c404aa12 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 20 Apr 2016 15:09:44 -0500
Subject: debug tracers

---
 src/greeter.cpp     | 9 ++++++++-
 src/usb-manager.cpp | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index f9cd965..a064ec2 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -66,6 +66,8 @@ private:
 
     void on_bus_ready(GDBusConnection* bus)
     {
+        g_message("%s bus is ready", G_STRLOC);
+
         m_bus = G_DBUS_CONNECTION(g_object_ref(G_OBJECT(bus)));
 
         g_dbus_connection_call(m_bus,
@@ -95,6 +97,7 @@ private:
 
     static void on_get_is_active_ready(GObject* source, GAsyncResult* res, gpointer gself)
     {
+        g_message("%s", G_STRLOC);
         GError* error {};
         auto v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);
         if (error != nullptr) {
@@ -102,6 +105,7 @@ private:
                 g_warning("UsbSnap: Error getting session bus: %s", error->message);
             g_clear_error(&error);
         } else {
+            g_message("%s v is %s", G_STRLOC, g_variant_print(v, true));
             GVariant* is_active {};
             g_variant_get_child(v, 0, "v", &is_active);
             static_cast<Impl*>(gself)->m_is_active.set(g_variant_get_boolean(is_active));
@@ -124,10 +128,13 @@ private:
         g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE)));
 
         auto v = g_variant_get_child_value (parameters, 1);
+        if (v != nullptr)
+            g_message("%s v is %s", G_STRLOC, g_variant_print(v, true));
+
         gboolean is_active {};
         if (g_variant_lookup(v, "IsActive", "b", &is_active))
         {
-            g_debug("%s is_active changed to %d", G_STRLOC, int(is_active));
+            g_message("%s is_active changed to %d", G_STRLOC, int(is_active));
             static_cast<Impl*>(gself)->m_is_active.set(is_active);
         }
         g_clear_pointer(&v, g_variant_unref);
diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index 4d750c0..d2d82c3 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -92,6 +92,7 @@ private:
 
     void maybe_snap()
     {
+g_message("%s m_req.public_key.empty() %d && m_greeter->is_active().get() %d", G_STRLOC, int(m_req.public_key.empty()), int(m_greeter->is_active().get()));
         // don't prompt in the greeter!
         if (!m_req.public_key.empty() && !m_greeter->is_active().get())
             snap();
-- 
cgit v1.2.3


From e683501043c00810558db55461b49c66ecf1aa0b Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 20 Apr 2016 16:36:10 -0500
Subject: more tracers

---
 src/greeter.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index a064ec2..d2e34a0 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -29,6 +29,7 @@ public:
     Impl():
         m_cancellable{g_cancellable_new()}
     {
+        g_message("%s getting bus", G_STRLOC);
         g_bus_get(G_BUS_TYPE_SESSION, m_cancellable, on_bus_ready_static, this);
     }
 
@@ -52,6 +53,7 @@ private:
 
     static void on_bus_ready_static(GObject* /*source*/, GAsyncResult* res, gpointer gself)
     {
+        g_message("%s %s", G_STRLOC, G_STRFUNC);
         GError* error {};
         auto bus = g_bus_get_finish (res, &error);
         if (error != nullptr) {
@@ -122,6 +124,8 @@ private:
                                              GVariant* parameters,
                                              gpointer gself)
     {
+        g_message("%s", G_STRLOC);
+
         g_return_if_fail(!g_strcmp0(object_path, DBusNames::UnityGreeter::PATH));
         g_return_if_fail(!g_strcmp0(interface_name, DBusNames::Properties::INTERFACE));
         g_return_if_fail(!g_strcmp0(signal_name, DBusNames::Properties::PropertiesChanged::NAME));
-- 
cgit v1.2.3


From cb46051005d5d9d1f21d7cb82b9fffd21f88c4c9 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 20 Apr 2016 17:09:14 -0500
Subject: watch for the Greeter to appear on the bus

---
 src/greeter.cpp | 144 ++++++++++++++++++++++++++++++++------------------------
 src/greeter.h   |   4 +-
 src/main.cpp    |  12 ++++-
 3 files changed, 96 insertions(+), 64 deletions(-)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index d2e34a0..9d331d7 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -26,21 +26,40 @@ class UnityGreeter::Impl
 {
 public:
 
-    Impl():
+    explicit Impl(GDBusConnection* connection):
+        m_bus(G_DBUS_CONNECTION(g_object_ref(connection))),
         m_cancellable{g_cancellable_new()}
     {
-        g_message("%s getting bus", G_STRLOC);
-        g_bus_get(G_BUS_TYPE_SESSION, m_cancellable, on_bus_ready_static, this);
+g_message("%s %s", G_STRLOC, G_STRFUNC);
+
+        m_watcher_id = g_bus_watch_name_on_connection(
+            m_bus,
+            DBusNames::UnityGreeter::NAME,
+            G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
+            on_greeter_appeared,
+            on_greeter_vanished,
+            this,
+            nullptr);
+
+        m_subscription_id = g_dbus_connection_signal_subscribe(
+            m_bus,
+            DBusNames::UnityGreeter::NAME,
+            DBusNames::Properties::INTERFACE,
+            DBusNames::Properties::PropertiesChanged::NAME,
+            DBusNames::UnityGreeter::PATH,
+            DBusNames::UnityGreeter::INTERFACE,
+            G_DBUS_SIGNAL_FLAGS_NONE,
+            on_properties_changed_signal,
+            this,
+            nullptr);
     }
 
     ~Impl()
     {
         g_cancellable_cancel(m_cancellable);
         g_clear_object(&m_cancellable);
-
-        if (m_subscription_id != 0)
-            g_dbus_connection_signal_unsubscribe (m_bus, m_subscription_id);
-
+        g_bus_unwatch_name(m_watcher_id);
+        g_dbus_connection_signal_unsubscribe(m_bus, m_subscription_id);
         g_clear_object(&m_bus);
     }
 
@@ -51,60 +70,55 @@ public:
 
 private:
 
-    static void on_bus_ready_static(GObject* /*source*/, GAsyncResult* res, gpointer gself)
+    static void on_greeter_appeared(
+        GDBusConnection* /*session_bus*/,
+        const char* /*name*/,
+        const char* name_owner,
+        gpointer gself)
     {
         g_message("%s %s", G_STRLOC, G_STRFUNC);
-        GError* error {};
-        auto bus = g_bus_get_finish (res, &error);
-        if (error != nullptr) {
-            if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-                g_warning("UsbSnap: Error getting session bus: %s", error->message);
-            g_clear_error(&error);
-        } else {
-            static_cast<Impl*>(gself)->on_bus_ready(bus);
-        }
-        g_clear_object(&bus);
+        auto self = static_cast<Impl*>(gself);
+
+        self->m_owner = name_owner;
+
+        g_dbus_connection_call(
+            self->m_bus,
+            DBusNames::UnityGreeter::NAME,
+            DBusNames::UnityGreeter::PATH,
+            DBusNames::Properties::INTERFACE,
+            "Get",
+            g_variant_new("(ss)", DBusNames::UnityGreeter::INTERFACE, "IsActive"),
+            G_VARIANT_TYPE("(v)"),
+            G_DBUS_CALL_FLAGS_NONE,
+            -1,
+            self->m_cancellable,
+            on_get_is_active_ready,
+            gself);
     }
 
-    void on_bus_ready(GDBusConnection* bus)
+    static void on_greeter_vanished(
+        GDBusConnection* /*session_bus*/,
+        const char* /*name*/,
+        gpointer gself)
     {
-        g_message("%s bus is ready", G_STRLOC);
-
-        m_bus = G_DBUS_CONNECTION(g_object_ref(G_OBJECT(bus)));
-
-        g_dbus_connection_call(m_bus,
-                               DBusNames::UnityGreeter::NAME,
-                               DBusNames::UnityGreeter::PATH,
-                               DBusNames::Properties::INTERFACE,
-                               "Get",
-                               g_variant_new("(ss)", DBusNames::UnityGreeter::INTERFACE, "IsActive"),
-                               G_VARIANT_TYPE("(v)"),
-                               G_DBUS_CALL_FLAGS_NONE,
-                               -1,
-                               m_cancellable,
-                               on_get_is_active_ready,
-                               this);
-
-        m_subscription_id = g_dbus_connection_signal_subscribe(m_bus,
-                                                               DBusNames::UnityGreeter::NAME,
-                                                               DBusNames::Properties::INTERFACE,
-                                                               DBusNames::Properties::PropertiesChanged::NAME,
-                                                               DBusNames::UnityGreeter::PATH,
-                                                               DBusNames::UnityGreeter::INTERFACE,
-                                                               G_DBUS_SIGNAL_FLAGS_NONE,
-                                                               on_properties_changed_signal,
-                                                               this,
-                                                               nullptr);
+        g_message("%s %s", G_STRLOC, G_STRFUNC);
+        auto self = static_cast<Impl*>(gself);
+
+        self->m_owner.clear();
+        self->m_is_active.set(false);
     }
 
-    static void on_get_is_active_ready(GObject* source, GAsyncResult* res, gpointer gself)
+    static void on_get_is_active_ready(
+        GObject* source,
+        GAsyncResult* res, 
+        gpointer gself)
     {
         g_message("%s", G_STRLOC);
         GError* error {};
         auto v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);
         if (error != nullptr) {
             if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-                g_warning("UsbSnap: Error getting session bus: %s", error->message);
+                g_warning("Greeter: Error getting IsActive property: %s", error->message);
             g_clear_error(&error);
         } else {
             g_message("%s v is %s", G_STRLOC, g_variant_print(v, true));
@@ -116,22 +130,24 @@ private:
         g_clear_pointer(&v, g_variant_unref);
     }
 
-    static void on_properties_changed_signal(GDBusConnection* /*connection*/,
-                                             const gchar* /*sender_name*/,
-                                             const gchar* object_path,
-                                             const gchar* interface_name,
-                                             const gchar* signal_name,
-                                             GVariant* parameters,
-                                             gpointer gself)
+    static void on_properties_changed_signal(
+        GDBusConnection* /*connection*/,
+        const gchar* sender_name,
+        const gchar* object_path,
+        const gchar* interface_name,
+        const gchar* signal_name,
+        GVariant* parameters,
+        gpointer gself)
     {
-        g_message("%s", G_STRLOC);
+        auto self = static_cast<Impl*>(gself);
 
+        g_return_if_fail(!g_strcmp0(sender_name, self->m_owner.c_str()));
         g_return_if_fail(!g_strcmp0(object_path, DBusNames::UnityGreeter::PATH));
         g_return_if_fail(!g_strcmp0(interface_name, DBusNames::Properties::INTERFACE));
         g_return_if_fail(!g_strcmp0(signal_name, DBusNames::Properties::PropertiesChanged::NAME));
         g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE)));
 
-        auto v = g_variant_get_child_value (parameters, 1);
+        auto v = g_variant_get_child_value(parameters, 1);
         if (v != nullptr)
             g_message("%s v is %s", G_STRLOC, g_variant_print(v, true));
 
@@ -139,15 +155,19 @@ private:
         if (g_variant_lookup(v, "IsActive", "b", &is_active))
         {
             g_message("%s is_active changed to %d", G_STRLOC, int(is_active));
-            static_cast<Impl*>(gself)->m_is_active.set(is_active);
+            self->m_is_active.set(is_active);
         }
         g_clear_pointer(&v, g_variant_unref);
+
     }
 
-    core::Property<bool> m_is_active;
-    GCancellable* m_cancellable {};
+    core::Property<bool> m_is_active {false};
+
     GDBusConnection* m_bus {};
+    GCancellable* m_cancellable {};
+    guint m_watcher_id {};
     unsigned int m_subscription_id {};
+    std::string m_owner;
 };
 
 /***
@@ -158,8 +178,8 @@ Greeter::Greeter() =default;
 
 Greeter::~Greeter() =default;
 
-UnityGreeter::UnityGreeter():
-    impl{new Impl{}}
+UnityGreeter::UnityGreeter(GDBusConnection* connection):
+    impl{new Impl{connection}}
 {
 }
 
diff --git a/src/greeter.h b/src/greeter.h
index e084d25..6707c4f 100644
--- a/src/greeter.h
+++ b/src/greeter.h
@@ -21,6 +21,8 @@
 
 #include <core/property.h>
 
+#include <gio/gio.h>
+
 #include <memory>
 #include <string>
 
@@ -36,7 +38,7 @@ public:
 class UnityGreeter: public Greeter
 {
 public:
-    UnityGreeter();
+    explicit UnityGreeter(GDBusConnection* connection);
     virtual ~UnityGreeter();
     core::Property<bool>& is_active() override;
 
diff --git a/src/main.cpp b/src/main.cpp
index 52cdd58..ee05f52 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,6 +47,15 @@ main(int /*argc*/, char** /*argv*/)
       g_main_loop_quit(loop);
     };
 
+    // get the session bus
+    GError* error {};
+    auto session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, &error);
+    if (error != nullptr) {
+        g_critical("Unable to get session bus: %s", error->message);
+        g_clear_error(&error);
+        return 0;
+    }
+
     // build all our indicators.
     // Right now we've only got one -- rotation lock -- but hey, we can dream.
     std::vector<std::shared_ptr<Indicator>> indicators;
@@ -63,7 +72,7 @@ main(int /*argc*/, char** /*argv*/)
     static constexpr char const * ADB_SOCKET_PATH {"/dev/socket/adbd"};
     static constexpr char const * PUBLIC_KEYS_FILENAME {"/data/misc/adb/adb_keys"};
     auto usb_monitor = std::make_shared<GUDevUsbMonitor>();
-    auto greeter = std::make_shared<UnityGreeter>();
+    auto greeter = std::make_shared<UnityGreeter>(session_bus);
     UsbManager usb_manager {ADB_SOCKET_PATH, PUBLIC_KEYS_FILENAME, usb_monitor, greeter};
 
     // let's go!
@@ -71,5 +80,6 @@ main(int /*argc*/, char** /*argv*/)
 
     // cleanup
     g_main_loop_unref(loop);
+    g_clear_object(&session_bus);
     return 0;
 }
-- 
cgit v1.2.3


From e1284eb774d75f96d61787f116b0d79328b27286 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 20 Apr 2016 17:32:17 -0500
Subject: remove tracers

---
 src/greeter.cpp     | 10 +---------
 src/usb-manager.cpp |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index 9d331d7..903bd2a 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -30,8 +30,6 @@ public:
         m_bus(G_DBUS_CONNECTION(g_object_ref(connection))),
         m_cancellable{g_cancellable_new()}
     {
-g_message("%s %s", G_STRLOC, G_STRFUNC);
-
         m_watcher_id = g_bus_watch_name_on_connection(
             m_bus,
             DBusNames::UnityGreeter::NAME,
@@ -76,7 +74,6 @@ private:
         const char* name_owner,
         gpointer gself)
     {
-        g_message("%s %s", G_STRLOC, G_STRFUNC);
         auto self = static_cast<Impl*>(gself);
 
         self->m_owner = name_owner;
@@ -101,7 +98,6 @@ private:
         const char* /*name*/,
         gpointer gself)
     {
-        g_message("%s %s", G_STRLOC, G_STRFUNC);
         auto self = static_cast<Impl*>(gself);
 
         self->m_owner.clear();
@@ -113,7 +109,6 @@ private:
         GAsyncResult* res, 
         gpointer gself)
     {
-        g_message("%s", G_STRLOC);
         GError* error {};
         auto v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);
         if (error != nullptr) {
@@ -121,7 +116,6 @@ private:
                 g_warning("Greeter: Error getting IsActive property: %s", error->message);
             g_clear_error(&error);
         } else {
-            g_message("%s v is %s", G_STRLOC, g_variant_print(v, true));
             GVariant* is_active {};
             g_variant_get_child(v, 0, "v", &is_active);
             static_cast<Impl*>(gself)->m_is_active.set(g_variant_get_boolean(is_active));
@@ -148,13 +142,11 @@ private:
         g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE)));
 
         auto v = g_variant_get_child_value(parameters, 1);
-        if (v != nullptr)
-            g_message("%s v is %s", G_STRLOC, g_variant_print(v, true));
 
         gboolean is_active {};
         if (g_variant_lookup(v, "IsActive", "b", &is_active))
         {
-            g_message("%s is_active changed to %d", G_STRLOC, int(is_active));
+            g_debug("%s is_active changed to %d", G_STRLOC, int(is_active));
             self->m_is_active.set(is_active);
         }
         g_clear_pointer(&v, g_variant_unref);
diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index d2d82c3..4d750c0 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -92,7 +92,6 @@ private:
 
     void maybe_snap()
     {
-g_message("%s m_req.public_key.empty() %d && m_greeter->is_active().get() %d", G_STRLOC, int(m_req.public_key.empty()), int(m_greeter->is_active().get()));
         // don't prompt in the greeter!
         if (!m_req.public_key.empty() && !m_greeter->is_active().get())
             snap();
-- 
cgit v1.2.3


From 3b84a37b2caae0c7c971b3c7cc5df9be1319a5ac Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 21 Apr 2016 09:19:25 -0500
Subject: don't pass a GDBusConnection to the Greeter ctor

---
 src/greeter.cpp | 109 +++++++++++++++++++++++++++++++++++---------------------
 src/greeter.h   |   4 +--
 src/main.cpp    |  12 +------
 3 files changed, 70 insertions(+), 55 deletions(-)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index 903bd2a..7f79bf9 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -26,40 +26,20 @@ class UnityGreeter::Impl
 {
 public:
 
-    explicit Impl(GDBusConnection* connection):
-        m_bus(G_DBUS_CONNECTION(g_object_ref(connection))),
-        m_cancellable{g_cancellable_new()}
+    explicit Impl()
     {
-        m_watcher_id = g_bus_watch_name_on_connection(
-            m_bus,
-            DBusNames::UnityGreeter::NAME,
-            G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
-            on_greeter_appeared,
-            on_greeter_vanished,
-            this,
-            nullptr);
-
-        m_subscription_id = g_dbus_connection_signal_subscribe(
-            m_bus,
-            DBusNames::UnityGreeter::NAME,
-            DBusNames::Properties::INTERFACE,
-            DBusNames::Properties::PropertiesChanged::NAME,
-            DBusNames::UnityGreeter::PATH,
-            DBusNames::UnityGreeter::INTERFACE,
-            G_DBUS_SIGNAL_FLAGS_NONE,
-            on_properties_changed_signal,
-            this,
-            nullptr);
+        m_cancellable.reset(
+            g_cancellable_new(),
+            [](GCancellable* c){
+                g_cancellable_cancel(c);
+                g_clear_object(&c);
+            }
+        );
+
+        g_bus_get(G_BUS_TYPE_SESSION, m_cancellable.get(), on_bus_ready, this);
     }
 
-    ~Impl()
-    {
-        g_cancellable_cancel(m_cancellable);
-        g_clear_object(&m_cancellable);
-        g_bus_unwatch_name(m_watcher_id);
-        g_dbus_connection_signal_unsubscribe(m_bus, m_subscription_id);
-        g_clear_object(&m_bus);
-    }
+    ~Impl() =default;
 
     core::Property<bool>& is_active()
     {
@@ -68,8 +48,57 @@ public:
 
 private:
 
+    static void on_bus_ready(
+        GObject* /*source*/,
+        GAsyncResult* res,
+        gpointer gself)
+    {
+        GError* error {};
+        auto bus = g_bus_get_finish(res, &error);
+        if (error != nullptr)
+        {
+            if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+                g_warning("Greeter: Error getting bus: %s", error->message);
+            g_clear_error(&error);
+        }
+        else
+        {
+            auto self = static_cast<Impl*>(gself);
+
+            const auto watcher_id = g_bus_watch_name_on_connection(
+                bus,
+                DBusNames::UnityGreeter::NAME,
+                G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
+                on_greeter_appeared,
+                on_greeter_vanished,
+                gself,
+                nullptr);
+
+            const auto subscription_id = g_dbus_connection_signal_subscribe(
+                bus,
+                DBusNames::UnityGreeter::NAME,
+                DBusNames::Properties::INTERFACE,
+                DBusNames::Properties::PropertiesChanged::NAME,
+                DBusNames::UnityGreeter::PATH,
+                DBusNames::UnityGreeter::INTERFACE,
+                G_DBUS_SIGNAL_FLAGS_NONE,
+                on_properties_changed_signal,
+                gself,
+                nullptr);
+
+            self->m_bus.reset(
+                bus,
+                [watcher_id, subscription_id](GDBusConnection* o){
+                    g_bus_unwatch_name(watcher_id);
+                    g_dbus_connection_signal_unsubscribe(o, subscription_id);
+                    g_clear_object(&o);
+                }
+            );
+        }
+    }
+
     static void on_greeter_appeared(
-        GDBusConnection* /*session_bus*/,
+        GDBusConnection* bus,
         const char* /*name*/,
         const char* name_owner,
         gpointer gself)
@@ -79,7 +108,7 @@ private:
         self->m_owner = name_owner;
 
         g_dbus_connection_call(
-            self->m_bus,
+            bus,
             DBusNames::UnityGreeter::NAME,
             DBusNames::UnityGreeter::PATH,
             DBusNames::Properties::INTERFACE,
@@ -88,13 +117,13 @@ private:
             G_VARIANT_TYPE("(v)"),
             G_DBUS_CALL_FLAGS_NONE,
             -1,
-            self->m_cancellable,
+            self->m_cancellable.get(),
             on_get_is_active_ready,
             gself);
     }
 
     static void on_greeter_vanished(
-        GDBusConnection* /*session_bus*/,
+        GDBusConnection* /*bus*/,
         const char* /*name*/,
         gpointer gself)
     {
@@ -155,10 +184,8 @@ private:
 
     core::Property<bool> m_is_active {false};
 
-    GDBusConnection* m_bus {};
-    GCancellable* m_cancellable {};
-    guint m_watcher_id {};
-    unsigned int m_subscription_id {};
+    std::shared_ptr<GDBusConnection> m_bus;
+    std::shared_ptr<GCancellable> m_cancellable;
     std::string m_owner;
 };
 
@@ -170,8 +197,8 @@ Greeter::Greeter() =default;
 
 Greeter::~Greeter() =default;
 
-UnityGreeter::UnityGreeter(GDBusConnection* connection):
-    impl{new Impl{connection}}
+UnityGreeter::UnityGreeter():
+    impl{new Impl{}}
 {
 }
 
diff --git a/src/greeter.h b/src/greeter.h
index 6707c4f..9508220 100644
--- a/src/greeter.h
+++ b/src/greeter.h
@@ -21,8 +21,6 @@
 
 #include <core/property.h>
 
-#include <gio/gio.h>
-
 #include <memory>
 #include <string>
 
@@ -38,7 +36,7 @@ public:
 class UnityGreeter: public Greeter
 {
 public:
-    explicit UnityGreeter(GDBusConnection* connection);
+    explicit UnityGreeter();
     virtual ~UnityGreeter();
     core::Property<bool>& is_active() override;
 
diff --git a/src/main.cpp b/src/main.cpp
index ee05f52..52cdd58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,15 +47,6 @@ main(int /*argc*/, char** /*argv*/)
       g_main_loop_quit(loop);
     };
 
-    // get the session bus
-    GError* error {};
-    auto session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, &error);
-    if (error != nullptr) {
-        g_critical("Unable to get session bus: %s", error->message);
-        g_clear_error(&error);
-        return 0;
-    }
-
     // build all our indicators.
     // Right now we've only got one -- rotation lock -- but hey, we can dream.
     std::vector<std::shared_ptr<Indicator>> indicators;
@@ -72,7 +63,7 @@ main(int /*argc*/, char** /*argv*/)
     static constexpr char const * ADB_SOCKET_PATH {"/dev/socket/adbd"};
     static constexpr char const * PUBLIC_KEYS_FILENAME {"/data/misc/adb/adb_keys"};
     auto usb_monitor = std::make_shared<GUDevUsbMonitor>();
-    auto greeter = std::make_shared<UnityGreeter>(session_bus);
+    auto greeter = std::make_shared<UnityGreeter>();
     UsbManager usb_manager {ADB_SOCKET_PATH, PUBLIC_KEYS_FILENAME, usb_monitor, greeter};
 
     // let's go!
@@ -80,6 +71,5 @@ main(int /*argc*/, char** /*argv*/)
 
     // cleanup
     g_main_loop_unref(loop);
-    g_clear_object(&session_bus);
     return 0;
 }
-- 
cgit v1.2.3


From d4e82e7d4fa1937d27d1397a036af2b6b03349b3 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 21 Apr 2016 09:33:08 -0500
Subject: code cleanup to prepare for MR

---
 src/greeter.cpp | 15 ++++++---------
 src/greeter.h   |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index 7f79bf9..d41160f 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -26,13 +26,13 @@ class UnityGreeter::Impl
 {
 public:
 
-    explicit Impl()
+    Impl()
     {
         m_cancellable.reset(
             g_cancellable_new(),
-            [](GCancellable* c){
-                g_cancellable_cancel(c);
-                g_clear_object(&c);
+            [](GCancellable* o){
+                g_cancellable_cancel(o);
+                g_clear_object(&o);
             }
         );
 
@@ -154,7 +154,7 @@ private:
     }
 
     static void on_properties_changed_signal(
-        GDBusConnection* /*connection*/,
+        GDBusConnection* /*bus*/,
         const gchar* sender_name,
         const gchar* object_path,
         const gchar* interface_name,
@@ -171,7 +171,6 @@ private:
         g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE)));
 
         auto v = g_variant_get_child_value(parameters, 1);
-
         gboolean is_active {};
         if (g_variant_lookup(v, "IsActive", "b", &is_active))
         {
@@ -179,13 +178,11 @@ private:
             self->m_is_active.set(is_active);
         }
         g_clear_pointer(&v, g_variant_unref);
-
     }
 
     core::Property<bool> m_is_active {false};
-
-    std::shared_ptr<GDBusConnection> m_bus;
     std::shared_ptr<GCancellable> m_cancellable;
+    std::shared_ptr<GDBusConnection> m_bus;
     std::string m_owner;
 };
 
diff --git a/src/greeter.h b/src/greeter.h
index 9508220..e084d25 100644
--- a/src/greeter.h
+++ b/src/greeter.h
@@ -36,7 +36,7 @@ public:
 class UnityGreeter: public Greeter
 {
 public:
-    explicit UnityGreeter();
+    UnityGreeter();
     virtual ~UnityGreeter();
     core::Property<bool>& is_active() override;
 
-- 
cgit v1.2.3


From ce5234162fa0c534ff9abf3fce3d03f4b01e893e Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 22 Apr 2016 09:43:44 -0500
Subject: don't prompt when the greeter's not running yet: change greeter's
 payload from an 'is_active' bool to a three-value state of active, inactive,
 and unavailable

---
 src/greeter.cpp     | 18 +++++++++---------
 src/greeter.h       |  6 ++++--
 src/usb-manager.cpp | 14 ++++++++++----
 3 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index d41160f..317a829 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -41,9 +41,9 @@ public:
 
     ~Impl() =default;
 
-    core::Property<bool>& is_active()
+    core::Property<State>& state()
     {
-        return m_is_active;
+        return m_state;
     }
 
 private:
@@ -130,7 +130,7 @@ private:
         auto self = static_cast<Impl*>(gself);
 
         self->m_owner.clear();
-        self->m_is_active.set(false);
+        self->m_state.set(State::UNAVAILABLE);
     }
 
     static void on_get_is_active_ready(
@@ -147,7 +147,7 @@ private:
         } else {
             GVariant* is_active {};
             g_variant_get_child(v, 0, "v", &is_active);
-            static_cast<Impl*>(gself)->m_is_active.set(g_variant_get_boolean(is_active));
+            static_cast<Impl*>(gself)->m_state.set(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE);
             g_clear_pointer(&is_active, g_variant_unref);
         }
         g_clear_pointer(&v, g_variant_unref);
@@ -175,12 +175,12 @@ private:
         if (g_variant_lookup(v, "IsActive", "b", &is_active))
         {
             g_debug("%s is_active changed to %d", G_STRLOC, int(is_active));
-            self->m_is_active.set(is_active);
+            self->m_state.set(is_active ? State::ACTIVE : State::INACTIVE);
         }
         g_clear_pointer(&v, g_variant_unref);
     }
 
-    core::Property<bool> m_is_active {false};
+    core::Property<State> m_state {State::UNAVAILABLE};
     std::shared_ptr<GCancellable> m_cancellable;
     std::shared_ptr<GDBusConnection> m_bus;
     std::string m_owner;
@@ -201,8 +201,8 @@ UnityGreeter::UnityGreeter():
 
 UnityGreeter::~UnityGreeter() =default;
 
-core::Property<bool>&
-UnityGreeter::is_active()
+core::Property<Greeter::State>&
+UnityGreeter::state()
 {
-    return impl->is_active();
+    return impl->state();
 }
diff --git a/src/greeter.h b/src/greeter.h
index e084d25..cde1429 100644
--- a/src/greeter.h
+++ b/src/greeter.h
@@ -29,7 +29,9 @@ class Greeter
 public:
     Greeter();
     virtual ~Greeter();
-    virtual core::Property<bool>& is_active() =0;
+
+    enum class State { UNAVAILABLE, INACTIVE, ACTIVE };
+    virtual core::Property<State>& state() =0;
 };
 
 
@@ -38,7 +40,7 @@ class UnityGreeter: public Greeter
 public:
     UnityGreeter();
     virtual ~UnityGreeter();
-    core::Property<bool>& is_active() override;
+    core::Property<State>& state() override;
 
 protected:
     class Impl;
diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index 4d750c0..80b274b 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -49,7 +49,7 @@ public:
             restart();
         });
 
-        m_greeter->is_active().changed().connect([this](bool /*is_active*/) {
+        m_greeter->state().changed().connect([this](Greeter::State /*state*/) {
             maybe_snap();
         });
 
@@ -92,9 +92,15 @@ private:
 
     void maybe_snap()
     {
-        // don't prompt in the greeter!
-        if (!m_req.public_key.empty() && !m_greeter->is_active().get())
-            snap();
+        // only prompt if there's something to prompt about
+        if (m_req.public_key.empty())
+            return;
+
+        // only prompt in an unlocked session
+        if (m_greeter->state().get() != Greeter::State::INACTIVE)
+            return;
+
+        snap();
     }
 
     void snap()
-- 
cgit v1.2.3


From 7d2fac8f46110a84d8396251cd0f38351b92f6ce Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 25 Apr 2016 11:05:22 +0200
Subject: add tracer log messages

---
 src/greeter.cpp     | 24 ++++++++++++++++--------
 src/greeter.h       |  4 ++++
 src/usb-manager.cpp |  6 +++++-
 3 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index 317a829..ed210b0 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -48,6 +48,12 @@ public:
 
 private:
 
+    void set_state(const State& state)
+    {
+g_message("%s setting state to %s", G_STRLOC, state_str(state));
+        m_state.set(state);
+    }
+
     static void on_bus_ready(
         GObject* /*source*/,
         GAsyncResult* res,
@@ -99,10 +105,11 @@ private:
 
     static void on_greeter_appeared(
         GDBusConnection* bus,
-        const char* /*name*/,
+        const char* name,
         const char* name_owner,
         gpointer gself)
     {
+g_message("%s %s appared on bus, owned by %s", G_STRLOC, name, name_owner);
         auto self = static_cast<Impl*>(gself);
 
         self->m_owner = name_owner;
@@ -124,13 +131,14 @@ private:
 
     static void on_greeter_vanished(
         GDBusConnection* /*bus*/,
-        const char* /*name*/,
+        const char* name,
         gpointer gself)
     {
+g_message("%s %s disappeared from bus", G_STRLOC, name);
         auto self = static_cast<Impl*>(gself);
 
         self->m_owner.clear();
-        self->m_state.set(State::UNAVAILABLE);
+        self->set_state(State::UNAVAILABLE);
     }
 
     static void on_get_is_active_ready(
@@ -138,6 +146,7 @@ private:
         GAsyncResult* res, 
         gpointer gself)
     {
+g_message("%s", G_STRLOC);
         GError* error {};
         auto v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);
         if (error != nullptr) {
@@ -145,9 +154,10 @@ private:
                 g_warning("Greeter: Error getting IsActive property: %s", error->message);
             g_clear_error(&error);
         } else {
+g_message("%s got '%s'", G_STRLOC, g_variant_print(v, true));
             GVariant* is_active {};
             g_variant_get_child(v, 0, "v", &is_active);
-            static_cast<Impl*>(gself)->m_state.set(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE);
+            static_cast<Impl*>(gself)->set_state(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE);
             g_clear_pointer(&is_active, g_variant_unref);
         }
         g_clear_pointer(&v, g_variant_unref);
@@ -163,6 +173,7 @@ private:
         gpointer gself)
     {
         auto self = static_cast<Impl*>(gself);
+g_message("%s on_properties_changed got %s", G_STRLOC, g_variant_print(parameters, true));
 
         g_return_if_fail(!g_strcmp0(sender_name, self->m_owner.c_str()));
         g_return_if_fail(!g_strcmp0(object_path, DBusNames::UnityGreeter::PATH));
@@ -173,10 +184,7 @@ private:
         auto v = g_variant_get_child_value(parameters, 1);
         gboolean is_active {};
         if (g_variant_lookup(v, "IsActive", "b", &is_active))
-        {
-            g_debug("%s is_active changed to %d", G_STRLOC, int(is_active));
-            self->m_state.set(is_active ? State::ACTIVE : State::INACTIVE);
-        }
+            self->set_state(is_active ? State::ACTIVE : State::INACTIVE);
         g_clear_pointer(&v, g_variant_unref);
     }
 
diff --git a/src/greeter.h b/src/greeter.h
index cde1429..f3012f6 100644
--- a/src/greeter.h
+++ b/src/greeter.h
@@ -31,6 +31,10 @@ public:
     virtual ~Greeter();
 
     enum class State { UNAVAILABLE, INACTIVE, ACTIVE };
+static inline const char* state_str(const State& state) {
+    static constexpr char const * state_str[] = { "Unavailable", "Inactive", "Active" };
+    return state_str[int(state)];
+}
     virtual core::Property<State>& state() =0;
 };
 
diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index 80b274b..9f67720 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -50,6 +50,7 @@ public:
         });
 
         m_greeter->state().changed().connect([this](Greeter::State /*state*/) {
+g_message("%s greeter state changed; calling maybe_snap()", G_STRLOC);
             maybe_snap();
         });
 
@@ -83,7 +84,7 @@ private:
         m_adbd_client.reset(new GAdbdClient{m_socket_path});
         m_adbd_client->on_pk_request().connect(
             [this](const AdbdClient::PKRequest& req) {
-                g_debug("%s got pk request: %s", G_STRLOC, req.fingerprint.c_str());
+                g_message("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str());
                 m_req = req;
                 maybe_snap();
             }
@@ -92,14 +93,17 @@ private:
 
     void maybe_snap()
     {
+g_message("%s m_req.public_key [%s]", G_STRLOC, m_req.public_key.c_str());
         // only prompt if there's something to prompt about
         if (m_req.public_key.empty())
             return;
 
+g_message("%s m_greeter->state() %s", G_STRLOC, Greeter::state_str(m_greeter->state().get()));
         // only prompt in an unlocked session
         if (m_greeter->state().get() != Greeter::State::INACTIVE)
             return;
 
+g_message("%s calling snap!", G_STRLOC);
         snap();
     }
 
-- 
cgit v1.2.3


From f8a8646b5cc0e9b59a5f953dcd8129c93d162915 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 27 Apr 2016 09:56:53 +0200
Subject: add tracers for the notification warning

---
 src/usb-manager.cpp | 11 +++++++++--
 src/usb-snap.cpp    |  6 ++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index 9f67720..ce546fe 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -50,6 +50,8 @@ public:
         });
 
         m_greeter->state().changed().connect([this](Greeter::State /*state*/) {
+g_message("%s clearing old snap, if any", G_STRLOC);
+            clear_snap();
 g_message("%s greeter state changed; calling maybe_snap()", G_STRLOC);
             maybe_snap();
         });
@@ -67,11 +69,16 @@ g_message("%s greeter state changed; calling maybe_snap()", G_STRLOC);
 
 private:
 
-    void clear()
+    void clear_snap()
     {
-        // clear out old state
         m_snap_connections.clear();
         m_snap.reset();
+    }
+
+    void clear()
+    {
+        // clear out old state
+        clear_snap();
         m_req = decltype(m_req)();
         m_adbd_client.reset();
     }
diff --git a/src/usb-snap.cpp b/src/usb-snap.cpp
index ba964fb..2b5424d 100644
--- a/src/usb-snap.cpp
+++ b/src/usb-snap.cpp
@@ -119,6 +119,7 @@ private:
         g_variant_builder_add(&hints_builder, "{sv}", "x-canonical-snap-decisions", g_variant_new_string("true"));
         g_variant_builder_add(&hints_builder, "{sv}", "x-canonical-private-affirmative-tint", g_variant_new_string("true"));
 
+g_message("%s calling notification notify", G_STRLOC);
         auto args = g_variant_new("(susssasa{sv}i)",
                                   "",
                                   uint32_t(0),
@@ -153,6 +154,7 @@ private:
                 g_warning("UsbSnap: Error calling Notify: %s", error->message);
             g_clear_error(&error);
         } else {
+g_message("%s on_notify reply %s", G_STRLOC, g_variant_print(reply, true));
             uint32_t id {};
             g_variant_get(reply, "(u)", &id);
             static_cast<Impl*>(gself)->on_notify_reply(id);
@@ -162,6 +164,7 @@ private:
 
     void on_notify_reply(uint32_t id)
     {
+g_message("%s setting m_notification_id to %d", G_STRLOC, int(id));
         m_notification_id = id;
     }
 
@@ -177,6 +180,7 @@ private:
         g_return_if_fail(!g_strcmp0(interface_name, DBusNames::Notify::INTERFACE));
 
         auto self = static_cast<Impl*>(gself);
+g_message("%s got signal %s with parameters %s", G_STRLOC, signal_name, g_variant_print(parameters, true));
 
         if (!g_strcmp0(signal_name, DBusNames::Notify::ActionInvoked::NAME))
         {
@@ -212,9 +216,11 @@ private:
 
     void on_notification_closed(uint32_t close_reason)
     {
+g_message("%s closed with reason %d", G_STRLOC, int(close_reason));
         if (close_reason == DBusNames::Notify::NotificationClosed::Reason::EXPIRED)
             m_on_user_response(AdbdClient::PKResponse::DENY, false);
 
+g_message("%s setting m_notification_id to 0", G_STRLOC);
         m_notification_id = 0;
     }
 
-- 
cgit v1.2.3


From a277302b1c1c2568c456abcb3432eb8f8ead0925 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 27 Apr 2016 10:22:00 +0200
Subject: choosing an action in the snap decision closes the notification, so
 when that happens clear our notification_id s.t. our dtor doesn't try to
 remove a notification that no longer exists

---
 src/usb-snap.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/usb-snap.cpp b/src/usb-snap.cpp
index 2b5424d..629898b 100644
--- a/src/usb-snap.cpp
+++ b/src/usb-snap.cpp
@@ -212,6 +212,8 @@ g_message("%s got signal %s with parameters %s", G_STRLOC, signal_name, g_varian
         const bool remember_this_choice = response == AdbdClient::PKResponse::ALLOW;
 
         m_on_user_response(response, remember_this_choice);
+g_message("%s clearing m_notification_id", G_STRLOC);
+        m_notification_id = 0;
     }
 
     void on_notification_closed(uint32_t close_reason)
@@ -220,7 +222,7 @@ g_message("%s closed with reason %d", G_STRLOC, int(close_reason));
         if (close_reason == DBusNames::Notify::NotificationClosed::Reason::EXPIRED)
             m_on_user_response(AdbdClient::PKResponse::DENY, false);
 
-g_message("%s setting m_notification_id to 0", G_STRLOC);
+g_message("%s clearing m_notification_id", G_STRLOC);
         m_notification_id = 0;
     }
 
-- 
cgit v1.2.3


From 020e49163abd558ae095ab9a00b6b69b4fdaef2a Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 27 Apr 2016 10:43:08 +0200
Subject: remove the temporary tracers

---
 src/greeter.cpp     | 6 ------
 src/usb-manager.cpp | 7 +------
 src/usb-snap.cpp    | 7 -------
 3 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index ed210b0..962a01d 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -50,7 +50,6 @@ private:
 
     void set_state(const State& state)
     {
-g_message("%s setting state to %s", G_STRLOC, state_str(state));
         m_state.set(state);
     }
 
@@ -109,7 +108,6 @@ g_message("%s setting state to %s", G_STRLOC, state_str(state));
         const char* name_owner,
         gpointer gself)
     {
-g_message("%s %s appared on bus, owned by %s", G_STRLOC, name, name_owner);
         auto self = static_cast<Impl*>(gself);
 
         self->m_owner = name_owner;
@@ -134,7 +132,6 @@ g_message("%s %s appared on bus, owned by %s", G_STRLOC, name, name_owner);
         const char* name,
         gpointer gself)
     {
-g_message("%s %s disappeared from bus", G_STRLOC, name);
         auto self = static_cast<Impl*>(gself);
 
         self->m_owner.clear();
@@ -146,7 +143,6 @@ g_message("%s %s disappeared from bus", G_STRLOC, name);
         GAsyncResult* res, 
         gpointer gself)
     {
-g_message("%s", G_STRLOC);
         GError* error {};
         auto v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);
         if (error != nullptr) {
@@ -154,7 +150,6 @@ g_message("%s", G_STRLOC);
                 g_warning("Greeter: Error getting IsActive property: %s", error->message);
             g_clear_error(&error);
         } else {
-g_message("%s got '%s'", G_STRLOC, g_variant_print(v, true));
             GVariant* is_active {};
             g_variant_get_child(v, 0, "v", &is_active);
             static_cast<Impl*>(gself)->set_state(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE);
@@ -173,7 +168,6 @@ g_message("%s got '%s'", G_STRLOC, g_variant_print(v, true));
         gpointer gself)
     {
         auto self = static_cast<Impl*>(gself);
-g_message("%s on_properties_changed got %s", G_STRLOC, g_variant_print(parameters, true));
 
         g_return_if_fail(!g_strcmp0(sender_name, self->m_owner.c_str()));
         g_return_if_fail(!g_strcmp0(object_path, DBusNames::UnityGreeter::PATH));
diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index ce546fe..cf3330d 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -50,9 +50,7 @@ public:
         });
 
         m_greeter->state().changed().connect([this](Greeter::State /*state*/) {
-g_message("%s clearing old snap, if any", G_STRLOC);
             clear_snap();
-g_message("%s greeter state changed; calling maybe_snap()", G_STRLOC);
             maybe_snap();
         });
 
@@ -91,7 +89,7 @@ private:
         m_adbd_client.reset(new GAdbdClient{m_socket_path});
         m_adbd_client->on_pk_request().connect(
             [this](const AdbdClient::PKRequest& req) {
-                g_message("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str());
+                g_debug("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str());
                 m_req = req;
                 maybe_snap();
             }
@@ -100,17 +98,14 @@ private:
 
     void maybe_snap()
     {
-g_message("%s m_req.public_key [%s]", G_STRLOC, m_req.public_key.c_str());
         // only prompt if there's something to prompt about
         if (m_req.public_key.empty())
             return;
 
-g_message("%s m_greeter->state() %s", G_STRLOC, Greeter::state_str(m_greeter->state().get()));
         // only prompt in an unlocked session
         if (m_greeter->state().get() != Greeter::State::INACTIVE)
             return;
 
-g_message("%s calling snap!", G_STRLOC);
         snap();
     }
 
diff --git a/src/usb-snap.cpp b/src/usb-snap.cpp
index 629898b..53db6c4 100644
--- a/src/usb-snap.cpp
+++ b/src/usb-snap.cpp
@@ -119,7 +119,6 @@ private:
         g_variant_builder_add(&hints_builder, "{sv}", "x-canonical-snap-decisions", g_variant_new_string("true"));
         g_variant_builder_add(&hints_builder, "{sv}", "x-canonical-private-affirmative-tint", g_variant_new_string("true"));
 
-g_message("%s calling notification notify", G_STRLOC);
         auto args = g_variant_new("(susssasa{sv}i)",
                                   "",
                                   uint32_t(0),
@@ -154,7 +153,6 @@ g_message("%s calling notification notify", G_STRLOC);
                 g_warning("UsbSnap: Error calling Notify: %s", error->message);
             g_clear_error(&error);
         } else {
-g_message("%s on_notify reply %s", G_STRLOC, g_variant_print(reply, true));
             uint32_t id {};
             g_variant_get(reply, "(u)", &id);
             static_cast<Impl*>(gself)->on_notify_reply(id);
@@ -164,7 +162,6 @@ g_message("%s on_notify reply %s", G_STRLOC, g_variant_print(reply, true));
 
     void on_notify_reply(uint32_t id)
     {
-g_message("%s setting m_notification_id to %d", G_STRLOC, int(id));
         m_notification_id = id;
     }
 
@@ -180,7 +177,6 @@ g_message("%s setting m_notification_id to %d", G_STRLOC, int(id));
         g_return_if_fail(!g_strcmp0(interface_name, DBusNames::Notify::INTERFACE));
 
         auto self = static_cast<Impl*>(gself);
-g_message("%s got signal %s with parameters %s", G_STRLOC, signal_name, g_variant_print(parameters, true));
 
         if (!g_strcmp0(signal_name, DBusNames::Notify::ActionInvoked::NAME))
         {
@@ -212,17 +208,14 @@ g_message("%s got signal %s with parameters %s", G_STRLOC, signal_name, g_varian
         const bool remember_this_choice = response == AdbdClient::PKResponse::ALLOW;
 
         m_on_user_response(response, remember_this_choice);
-g_message("%s clearing m_notification_id", G_STRLOC);
         m_notification_id = 0;
     }
 
     void on_notification_closed(uint32_t close_reason)
     {
-g_message("%s closed with reason %d", G_STRLOC, int(close_reason));
         if (close_reason == DBusNames::Notify::NotificationClosed::Reason::EXPIRED)
             m_on_user_response(AdbdClient::PKResponse::DENY, false);
 
-g_message("%s clearing m_notification_id", G_STRLOC);
         m_notification_id = 0;
     }
 
-- 
cgit v1.2.3


From 6dfd01c5db87f659beb5c53c0c3ea1f57ab0701b Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 27 Apr 2016 10:45:24 +0200
Subject: fix two trivial 'unused parameter' warnings in glib callbacks

---
 src/greeter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/greeter.cpp b/src/greeter.cpp
index 962a01d..9bd5db0 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -104,7 +104,7 @@ private:
 
     static void on_greeter_appeared(
         GDBusConnection* bus,
-        const char* name,
+        const char* /*name*/,
         const char* name_owner,
         gpointer gself)
     {
@@ -129,7 +129,7 @@ private:
 
     static void on_greeter_vanished(
         GDBusConnection* /*bus*/,
-        const char* name,
+        const char* /*name*/,
         gpointer gself)
     {
         auto self = static_cast<Impl*>(gself);
-- 
cgit v1.2.3


From d7a0cac8ebd836172ad6e4b9298ae92b3f9d8de9 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 29 Apr 2016 11:51:22 +0200
Subject: don't clear the snap decision when the greeter changes state

---
 src/usb-manager.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index cf3330d..9c45a56 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -50,7 +50,6 @@ public:
         });
 
         m_greeter->state().changed().connect([this](Greeter::State /*state*/) {
-            clear_snap();
             maybe_snap();
         });
 
-- 
cgit v1.2.3


From c66c33c4c1c70b197941f8c486196f3a56abd0e3 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 3 May 2016 18:07:48 -0500
Subject: always send a response to adb even in edge cases; e.g. send an
 auto-NO if the usb connection is broken while the prompt is up

---
 src/usb-manager.cpp | 92 +++++++++++++++++++++++++++--------------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

(limited to 'src')

diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index 9c45a56..65617c5 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -46,59 +46,54 @@ public:
         m_greeter{greeter}
     {
         m_usb_monitor->on_usb_disconnected().connect([this](const std::string& /*usb_name*/) {
-            restart();
+            m_req.reset();
         });
 
-        m_greeter->state().changed().connect([this](Greeter::State /*state*/) {
-            maybe_snap();
+        m_greeter->state().changed().connect([this](const Greeter::State& state) {
+            if (state == Greeter::State::INACTIVE)
+                maybe_snap();
+            else
+                stop_snap();
         });
 
-        restart();
+        // create a new adbd client
+        m_adbd_client.reset(new GAdbdClient{m_socket_path});
+        m_adbd_client->on_pk_request().connect(
+            [this](const AdbdClient::PKRequest& req) {
+                g_debug("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str());
+
+                m_response = AdbdClient::PKResponse::DENY; // set the fallback response
+                m_req.reset(
+                    new AdbdClient::PKRequest(req),
+                    [this](AdbdClient::PKRequest* r) {
+                        stop_snap();
+                        r->respond(m_response);
+                        delete r;
+                    }
+                );
+                maybe_snap();
+            }
+        );
     }
 
     ~Impl()
     {
-        if (m_restart_idle_tag)
-            g_source_remove(m_restart_idle_tag);
-
-        clear();
+        if (m_request_complete_idle_tag)
+            g_source_remove(m_request_complete_idle_tag);
     }
 
 private:
 
-    void clear_snap()
+    void stop_snap()
     {
         m_snap_connections.clear();
         m_snap.reset();
     }
 
-    void clear()
-    {
-        // clear out old state
-        clear_snap();
-        m_req = decltype(m_req)();
-        m_adbd_client.reset();
-    }
-
-    void restart()
-    {
-        clear();
-
-        // set a new client
-        m_adbd_client.reset(new GAdbdClient{m_socket_path});
-        m_adbd_client->on_pk_request().connect(
-            [this](const AdbdClient::PKRequest& req) {
-                g_debug("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str());
-                m_req = req;
-                maybe_snap();
-            }
-        );
-    }
-
     void maybe_snap()
     {
         // only prompt if there's something to prompt about
-        if (m_req.public_key.empty())
+        if (!m_req)
             return;
 
         // only prompt in an unlocked session
@@ -110,19 +105,25 @@ private:
 
     void snap()
     {
-        m_snap = std::make_shared<UsbSnap>(m_req.fingerprint);
+        m_snap = std::make_shared<UsbSnap>(m_req->fingerprint);
         m_snap_connections.insert((*m_snap).on_user_response().connect(
             [this](AdbdClient::PKResponse response, bool remember_choice){
-                g_debug("%s user responded! response %d, remember %d", G_STRLOC, int(response), int(remember_choice));
-                m_req.respond(response);
+
                 if (remember_choice && (response == AdbdClient::PKResponse::ALLOW))
-                    write_public_key(m_req.public_key);
-                m_restart_idle_tag = g_idle_add([](gpointer gself){
-                    auto self = static_cast<Impl*>(gself);
-                    self->m_restart_idle_tag = 0;
-                    self->restart();
-                    return G_SOURCE_REMOVE;
-                }, this);
+                    write_public_key(m_req->public_key);
+
+                m_response = response;
+
+                // defer finishing the request into an idle func because
+                // ScopedConnections can't be destroyed inside their callbacks
+                if (m_request_complete_idle_tag == 0) {
+                    m_request_complete_idle_tag = g_idle_add([](gpointer gself){
+                        auto self = static_cast<Impl*>(gself);
+                        self->m_request_complete_idle_tag = 0;
+                        self->m_req.reset();
+                        return G_SOURCE_REMOVE;
+                    }, this);
+                }
             }
         ));
     }
@@ -163,12 +164,13 @@ private:
     const std::shared_ptr<UsbMonitor> m_usb_monitor;
     const std::shared_ptr<Greeter> m_greeter;
  
-    unsigned int m_restart_idle_tag {};
+    unsigned int m_request_complete_idle_tag {};
 
     std::shared_ptr<GAdbdClient> m_adbd_client;
-    AdbdClient::PKRequest m_req;
     std::shared_ptr<UsbSnap> m_snap;
     std::set<core::ScopedConnection> m_snap_connections;
+    AdbdClient::PKResponse m_response {AdbdClient::PKResponse::DENY};
+    std::shared_ptr<AdbdClient::PKRequest> m_req;
 };
 
 /***
-- 
cgit v1.2.3