add a new Snap::Response enum for more flexible handling of snap decisions

3 files changed, 40 insertions, 26 deletions

diff --git a/include/datetime/snap.h b/include/datetime/snap.h
index a295d9f..099426b 100644
--- a/include/datetime/snap.h
+++ b/include/datetime/snap.h
@@ -42,11 +42,11 @@ public:
          const std::shared_ptr<const Settings>& settings);
     virtual ~Snap();
 
-    typedef std::function<void(const Appointment&, const Alarm&)> appointment_func;
+    enum class Response { None, Snooze, ShowApp };
+    typedef std::function<void(const Appointment&, const Alarm&, const Response&)> response_func;
     void operator()(const Appointment& appointment,
                     const Alarm& alarm,
-                    appointment_func snooze,
-                    appointment_func ok);
+                    response_func on_response);
 
 private:
     class Impl;
diff --git a/src/main.cpp b/src/main.cpp
index 034a5ef..9defed0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -153,14 +153,21 @@ main(int /*argc*/, char** /*argv*/)
     auto notification_engine = std::make_shared<ain::Engine>("ayatana-indicator-datetime-service");
     std::unique_ptr<Snap> snap (new Snap(notification_engine, state->settings));
     auto alarm_queue = create_simple_alarm_queue(state->clock, snooze_planner, engine, timezone_);
-    auto on_snooze = [snooze_planner](const Appointment& appointment, const Alarm& alarm) {
-        snooze_planner->add(appointment, alarm);
+    auto sound_builder = std::make_shared<uin::DefaultSoundBuilder>();
+    auto on_response = [snooze_planner, actions](const Appointment& appointment, const Alarm& alarm, const Snap::Response& response) {
+        switch(response) {
+            case Snap::Response::Snooze:
+                snooze_planner->add(appointment, alarm);
+                break;
+            case Snap::Response::ShowApp:
+                actions->open_appointment(appointment, appointment.begin);
+                break;
+            case Snap::Response::None:
+                break;
+        }
     };
-    auto on_ok = [actions](const Appointment& app, const Alarm&){
-        actions->open_appointment(app, app.begin);
-    };
-    auto on_alarm_reached = [&engine, &snap, &on_snooze, &on_ok](const Appointment& appointment, const Alarm& alarm) {
-        (*snap)(appointment, alarm, on_snooze, on_ok);
+    auto on_alarm_reached = [&engine, &snap, &on_response](const Appointment& appointment, const Alarm& alarm) {
+        (*snap)(appointment, alarm, on_response);
         engine->disable_ubuntu_alarm(appointment);
     };
     alarm_queue->alarm_reached().connect(on_alarm_reached);
diff --git a/src/snap.cpp b/src/snap.cpp
index 4078dd7..51d04ae 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -81,8 +81,7 @@ public:
 
     void operator()(const Appointment& appointment,
                     const Alarm& alarm,
-                    appointment_func snooze,
-                    appointment_func ok)
+                    response_func on_response)
     {
         // If calendar notifications are muted, don't show them
         if (!appointment.is_ubuntu_alarm() && calendar_events_are_muted()) {
@@ -153,28 +152,33 @@ public:
         if (interactive) {
             b.add_hint (ain::Builder::HINT_SNAP);
             b.add_hint (ain::Builder::HINT_AFFIRMATIVE_HINT);
-            b.add_action ("ok", _("OK"));
-            b.add_action ("snooze", _("Snooze"));
+            b.add_action (ACTION_NONE, _("OK"));
+            b.add_action (ACTION_SNOOZE, _("Snooze"));
         } else {
             b.add_hint (ain::Builder::HINT_INTERACTIVE);
-            b.add_action ("ok", _("OK"));
+            b.add_action (ACTION_SHOW_APP, _("OK"));
         }
 
         // add 'sound', 'haptic', and 'awake' objects to the capture so
         // they stay alive until the closed callback is called; i.e.,
         // for the lifespan of the notficiation
-        b.set_closed_callback([appointment, alarm, snooze, ok, sound, awake, haptic]
+        b.set_closed_callback([appointment, alarm, on_response, sound, awake, haptic]
                               (const std::string& action){
-            if (action == "snooze")
-                snooze(appointment, alarm);
-            else if (action == "ok")
-                ok(appointment, alarm);
+            Snap::Response response;
+            if (action == ACTION_SNOOZE)
+                response = Snap::Response::Snooze;
+            else if (action == ACTION_SHOW_APP)
+                response = Snap::Response::ShowApp;
+            else
+                response = Snap::Response::None;
+
+            on_response(appointment, alarm, response);
         });
 
-        //TODO: we need to extend it to support alarms appoitments
+        //TODO: we need to extend it to support alarms appointments
         if (!appointment.is_ubuntu_alarm()) {
-            b.set_timeout_callback([appointment, alarm, ok](){
-                ok(appointment, alarm);
+            b.set_timeout_callback([appointment, alarm, on_response](){
+                on_response(appointment, alarm, Snap::Response::ShowApp);
             });
         }
 
@@ -267,6 +271,10 @@ private:
     std::set<int> m_notifications;
     GCancellable * m_cancellable {nullptr};
     AccountsServiceSound * m_accounts_service_sound_proxy {nullptr};
+
+    static constexpr char const * ACTION_NONE {"none"};
+    static constexpr char const * ACTION_SNOOZE {"snooze"};
+    static constexpr char const * ACTION_SHOW_APP {"show-app"};
 };
 
 /***
@@ -286,10 +294,9 @@ Snap::~Snap()
 void
 Snap::operator()(const Appointment& appointment,
                  const Alarm& alarm,
-                 appointment_func show,
-                 appointment_func ok)
+                 response_func on_response)
 {
-  (*impl)(appointment, alarm, show, ok);
+  (*impl)(appointment, alarm, on_response);
 }
 
 /***