Unsubscribe dbus when object destroyed

Change-Id: I57cece60af50048b8328a2e1b73ba657e6c16ba5
Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/watchface-complication-provider/complication-provider-implementation.h b/watchface-complication-provider/complication-provider-implementation.h
index 8f96ede..e4762c8 100644 (file)
--- a/watchface-complication-provider/complication-provider-implementation.h
+++ b/watchface-complication-provider/complication-provider-implementation.h
@@ -33,7 +33,7 @@ namespace watchface_complication {
 
 class ComplicationProvider::Impl : IGDBus::IGDBusEvent {
  public:
-  virtual ~Impl() = default;
+  virtual ~Impl();
 
  private:
   friend class ComplicationProvider;

diff --git a/watchface-complication-provider/complication-provider.cc b/watchface-complication-provider/complication-provider.cc
index 54b9aff..f45f5de 100644 (file)
--- a/watchface-complication-provider/complication-provider.cc
+++ b/watchface-complication-provider/complication-provider.cc
@@ -72,6 +72,13 @@ ComplicationProvider::Impl::Impl(ComplicationProvider* parent,
   LOGI("subscribe signal %d", subscribe_id_);
 }
 
+ComplicationProvider::Impl::~Impl() {
+  LOGW("complication provider destroy %s", provider_id_.c_str());
+
+  if (subscribe_id_ > 0)
+    gdbus_.get()->UnSubscribeSignal(subscribe_id_);
+}
+
 ComplicationProvider::Impl::SenderInfo::SenderInfo(
     const std::string& sender_name, const char* sender_app_id,
     int watcher_id, std::string watch_name)

diff --git a/watchface-complication/editables-container-implementation.h b/watchface-complication/editables-container-implementation.h
index cf7d76a..de79894 100644 (file)
--- a/watchface-complication/editables-container-implementation.h
+++ b/watchface-complication/editables-container-implementation.h
@@ -31,7 +31,7 @@ namespace watchface_complication {
 
 class EditablesContainer::Impl : IGDBus::IGDBusEvent {
  public:
-  virtual ~Impl() = default;
+  virtual ~Impl();
 
  private:
   friend class EditablesContainer;

diff --git a/watchface-complication/editables-container.cc b/watchface-complication/editables-container.cc
index 9e5f53a..81914d1 100644 (file)
--- a/watchface-complication/editables-container.cc
+++ b/watchface-complication/editables-container.cc
@@ -50,6 +50,13 @@ EditablesContainer::Impl::Impl(EditablesContainer* parent, bool mock)
   LOGI("subscribe signal %d", subscribe_id_);
 }
 
+EditablesContainer::Impl::~Impl() {
+  LOGW("EditablesContainer destroy");
+
+  if (subscribe_id_ > 0)
+    gdbus_.get()->UnSubscribeSignal(subscribe_id_);
+}
+
 void EditablesContainer::Impl::OnSignal(GDBusConnection* connection,
                                         const std::string& sender_name,
                                         const std::string& object_path,