Remove editor_id from watchface_editable_request_edit

Unecessary param

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

diff --git a/unittest/src/test_editables_container.cc b/unittest/src/test_editables_container.cc
index d30d55a..148af46 100644 (file)
--- a/unittest/src/test_editables_container.cc
+++ b/unittest/src/test_editables_container.cc
@@ -121,7 +121,7 @@ TEST_F(EC, AddRemove)
 
 TEST_F(EC, RequestEdit)
 {
-  EXPECT_EQ(EC::container->RequestEdit("Editor"), 0);
+  EXPECT_EQ(EC::container->RequestEdit(), 0);
 }
 
 void _on_edit_ready_cb(watchface_editable_container_h handle, const char *editor_appid, void *user_data) {

diff --git a/watchface-complication/editables-container-implementation.h b/watchface-complication/editables-container-implementation.h
index 0471180..e240958 100644 (file)
--- a/watchface-complication/editables-container-implementation.h
+++ b/watchface-complication/editables-container-implementation.h
@@ -53,6 +53,7 @@ class EditablesContainer::Impl : ComplicationConnector::IEventListener {
  private:
   EditablesContainer* parent_;
   int subscribe_id_;
+  std::string editor_id_;
   int watcher_id_ = -1;
   std::list<std::shared_ptr<IEditable>> ed_list_;
 };

diff --git a/watchface-complication/editables-container.cc b/watchface-complication/editables-container.cc
index 40b33dc..cb3ca3e 100644 (file)
--- a/watchface-complication/editables-container.cc
+++ b/watchface-complication/editables-container.cc
@@ -61,7 +61,9 @@ void EditablesContainer::Impl::OnSignal(GDBusConnection* connection,
     ed_list_.clear();
     g_variant_get(parameters, "(&s)", &editor_id);
     LOGI("editor_id: %s", editor_id);
-    parent_->OnEditReady(std::string(editor_id));
+    editor_id_ = std::string(editor_id);
+    parent_->OnEditReady(editor_id_);
+
   } else if (signal_name.compare(
       ComplicationConnector::GetInst().GetCmdStr(
           ComplicationConnector::EditableEditPreview)) == 0) {
@@ -129,13 +131,13 @@ void EditablesContainer::Impl::OnAppear(const std::string& name,
     const std::string& name_owner) {
 }
 
-int EditablesContainer::RequestEdit(const std::string& editor_id) {
+int EditablesContainer::RequestEdit() {
   int list_idx = 0;
   int str_len = 0;
   bundle_raw *str_raw = NULL;
   std::unique_ptr<const char*[]> list_arr(new const char*[impl_->ed_list_.size()]);
 
-  if (editor_id.empty())
+  if (impl_->editor_id_.empty())
     return -1;
 
   for (auto& i : impl_->ed_list_) {
@@ -187,8 +189,8 @@ int EditablesContainer::RequestEdit(const std::string& editor_id) {
 
   ComplicationConnector::GetInst().EmitSignal(
     ComplicationConnector::Editable,
-    editor_id,
-    editor_id,
+    impl_->editor_id_,
+    impl_->editor_id_,
     -1,
     ComplicationConnector::GetInst().GetCmdStr(
         ComplicationConnector::EditableEditRequest),
@@ -197,7 +199,7 @@ int EditablesContainer::RequestEdit(const std::string& editor_id) {
                   str_raw)
   );
 
-  impl_->watcher_id_ = ComplicationConnector::GetInst().Watch(editor_id,
+  impl_->watcher_id_ = ComplicationConnector::GetInst().Watch(impl_->editor_id_,
       this->impl_.get());
 
   return WATCHFACE_COMPLICATION_ERROR_NONE;

diff --git a/watchface-complication/editables-container.h b/watchface-complication/editables-container.h
index 7dd939c..75fa35b 100644 (file)
--- a/watchface-complication/editables-container.h
+++ b/watchface-complication/editables-container.h
@@ -33,7 +33,7 @@ class EXPORT_API EditablesContainer : IEditablesEditorEvent {
   virtual ~EditablesContainer();
   int Add(std::shared_ptr<IEditable> ed, int editable_id);
   int Remove(std::shared_ptr<IEditable> ed);
-  int RequestEdit(const std::string& editor_id);
+  int RequestEdit();
   virtual void OnUpdate(const IEditable& ed, int selected_idx,
       IEditable::EditableState state);
   void OnEditReady(const std::string& editor_id) override;

diff --git a/watchface-complication/include/watchface-editable.h b/watchface-complication/include/watchface-editable.h
index 5d3cd5f..f6a6440 100644 (file)
--- a/watchface-complication/include/watchface-editable.h
+++ b/watchface-complication/include/watchface-editable.h
@@ -235,7 +235,7 @@ _watchface_editable_edit_ready_cb(watchface_editable_container_h handle,
        list_handle, geo, "Color");
        watchface_editable_candidates_list_destroy(list_handle);
 
-       watchface_editable_request_edit(handle, editor_appid, _on_editable_update, user_data);
+       watchface_editable_request_edit(handle, _on_editable_update, user_data);
 }
  * @endcode
  */
@@ -263,7 +263,6 @@ int watchface_editable_add_complication(watchface_editable_container_h handle,
                        watchface_editable_geo_s geo);
 
 int watchface_editable_request_edit(watchface_editable_container_h handle,
-                       const char *editor_appid,
                        watchface_editable_update_requested_cb cb,
                        void *user_data);
 int watchface_editable_add_edit_ready_cb(watchface_editable_edit_ready_cb cb,

diff --git a/watchface-complication/watchface-editable.cc b/watchface-complication/watchface-editable.cc
index 55cacbc..ed91d18 100644 (file)
--- a/watchface-complication/watchface-editable.cc
+++ b/watchface-complication/watchface-editable.cc
@@ -195,18 +195,16 @@ extern "C" EXPORT_API int watchface_editable_add_complication(
 }
 
 extern "C" EXPORT_API int watchface_editable_request_edit(
-    watchface_editable_container_h handle, const char *editor_appid,
+    watchface_editable_container_h handle,
     watchface_editable_update_requested_cb cb, void *user_data) {
-  if (handle == NULL || editor_appid == NULL || cb == NULL)
+  if (handle == NULL || cb == NULL)
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
 
   EditablesContainerStub* ec = static_cast<EditablesContainerStub*>(handle);
   auto ci = new UpdateCallbackInfo(cb, user_data);
   ec->ClearUpdateCallbackInfo();
   ec->AddUpdateCallbackInfo(ci);
-  ec->RequestEdit(std::string(editor_appid));
-
-  LOGI("Request edit to %s", editor_appid);
+  ec->RequestEdit();
 
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }