Remove group related code from capmgr

This job should be done other process.
(maybe some application or tool)

Change-Id: Ic2028c368d1ebcdfd8df558d7dfc94ec629b2393
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/common/mdg_manager.cc b/src/common/mdg_manager.cc
index 448011b4aa48bfffb93eacf9b5788aff376f3244..1263fb7ca899321b202b57306fec9e1f621c52de 100755 (executable)
--- a/src/common/mdg_manager.cc
+++ b/src/common/mdg_manager.cc
@@ -166,7 +166,7 @@ bool MDGManager::Initialize() {
     return false;
   }
 
-  if (!CreateGroup()) {
+  if (!FindGroup()) {
     LOG(ERROR) << "Failed to create capmgr group";
     return false;
   }
@@ -299,81 +299,7 @@ bool MDGManager::GroupFoundCb(mdg_group_type_e type, mdg_group_h group,
 void MDGManager::GroupFinishCb(int result, void* user_data) {
   LOG(INFO) << "Find group finished: " << result;
   MDGManager* mdgmgr = static_cast<MDGManager*>(user_data);
-  mdgmgr->FindDevices();
-}
-
-void MDGManager::GroupInviteFinishCb(int result, mdg_device_h invited_device,
-    void* user_data) {
-  LOG(INFO) << "GroupInviteFinishCb called. "
-            << "result: " << result;
-  MDGManager* mdgmgr = static_cast<MDGManager*>(user_data);
-  if (!mdgmgr->AddDevice(invited_device))
-    LOG(ERROR) << "Failed to add device to list!";
-}
-
-bool MDGManager::DeviceFoundCb(mdg_device_h device, void* user_data) {
-  char* device_id;
-  bool is_invited;
-  char* model_name;
-
-  int ret = mdg_device_info_get_device_id(device, &device_id);
-  if (ret != MDG_ERROR_NONE) {
-    LOG(ERROR) << "Failed to get device id: " << MDGErrorToString(ret);
-    return true;
-  }
-
-  bool found = false;
-  MDGManager* mdgmgr = static_cast<MDGManager*>(user_data);
-  for (const auto& id : GListRange<char*>(mdgmgr->device_id_list_)) {
-    if (!strcmp(device_id, id)) {
-      found = true;
-      break;
-    }
-  }
-
-  if (!found) {
-    LOG(DEBUG) << "capmgr group doesn't exist in this device";
-    free(device_id);
-    return true;
-  }
-
-  ret = mdg_device_info_is_invited(device, &is_invited);
-  if (ret != MDG_ERROR_NONE) {
-    LOG(ERROR) << "Failed to get is_invited: " << MDGErrorToString(ret);
-    free(device_id);
-    return true;
-  }
-
-  ret = mdg_device_info_get_model_name(device, &model_name);
-  if (ret != MDG_ERROR_NONE) {
-    LOG(ERROR) << "Failed to get model_name: " << MDGErrorToString(ret);
-    free(device_id);
-    return true;
-  }
-
-  LOG(INFO) << "Found not invited device. Invite this device. "
-            << "device_id: " << device_id
-            << ", is_invited: " << is_invited
-            << ", model_name: " << model_name;
-
-  free(model_name);
-  free(device_id);
-
-  ret = mdg_group_invite_device(mdgmgr->mdg_handle_, mdgmgr->group_handle_,
-      device, const_cast<char*>(kPIN), &MDGManager::GroupInviteFinishCb,
-      user_data);
-  if (ret != MDG_ERROR_NONE)
-      LOG(ERROR) << "Failed to invite device: " << MDGErrorToString(ret);
-
-  return true;
-}
-
-void MDGManager::DeviceFinishCb(int result, void* user_data) {
-  LOG(INFO) << "Find device finished: " << result;
-
-  int ret;
-  MDGManager* mdgmgr = static_cast<MDGManager*>(user_data);
-  ret = mdg_group_foreach_device(mdgmgr->mdg_handle_, mdgmgr->group_handle_,
+  int ret = mdg_group_foreach_device(mdgmgr->mdg_handle_, mdgmgr->group_handle_,
       &MDGManager::GroupForeachCb, user_data);
   if (ret != MDG_ERROR_NONE)
     LOG(ERROR) << "Failed to call mdg_group_foreach_device: "
@@ -445,18 +371,8 @@ void MDGManager::GroupInvitedCb(mdg_group_h group, void* user_data) {
   }
 }
 
-bool MDGManager::CreateGroup() {
-  int ret = mdg_group_create(mdg_handle_, const_cast<char*>(kGroupName));
-  if (ret == MDG_ERROR_NONE) {
-    LOG(INFO) << "Group for capmgr registered";
-  } else if (ret == MDG_ERROR_ALREADY_REGISTERED) {
-    LOG(INFO) << "Group for capmgr already registered";
-  } else {
-    LOG(ERROR) << "Failed to create group: " << MDGErrorToString(ret);
-    return false;
-  }
-
-  ret = mdg_group_find(mdg_handle_, kRequestTimeout,
+bool MDGManager::FindGroup() {
+  int ret = mdg_group_find(mdg_handle_, kRequestTimeout,
       &MDGManager::GroupFoundCb, &MDGManager::GroupFinishCb, this);
   if (ret != MDG_ERROR_NONE) {
     LOG(ERROR) << "Failed to find group: " << MDGErrorToString(ret);
@@ -684,10 +600,6 @@ int MDGManager::SendFile(const std::string& device_id,
 
 
 void MDGManager::FindDevices() {
-  int ret = mdg_device_find(mdg_handle_, kRequestTimeout, false,
-      &MDGManager::DeviceFoundCb, &MDGManager::DeviceFinishCb, this);
-  if (ret != MDG_ERROR_NONE)
-    LOG(ERROR) << "Failed to find device: " << MDGErrorToString(ret);
 }
 
 void MDGManager::RegisterEndpoint() {

diff --git a/src/common/mdg_manager.h b/src/common/mdg_manager.h
index 9fc55a17950869fd532a00ac49f45b60a03344da..0feb9a341cf42512e0f1028010bb8ba25afa28c9 100755 (executable)
--- a/src/common/mdg_manager.h
+++ b/src/common/mdg_manager.h
@@ -49,7 +49,7 @@ class MDGManager : public ConnectionManager {
       void* data);
 
   bool Initialize();
-  bool CreateGroup();
+  bool FindGroup();
   bool AddDevice(const mdg_device_h device);
   int SendData(const std::string& device_id, Command cmd,
       const unsigned char* data, size_t len);
@@ -62,10 +62,6 @@ class MDGManager : public ConnectionManager {
   static bool GroupFoundCb(mdg_group_type_e type, mdg_group_h group,
       void* user_data);
   static void GroupFinishCb(int result, void* user_data);
-  static void GroupInviteFinishCb(int result, mdg_device_h invited_device,
-      void* user_data);
-  static bool DeviceFoundCb(mdg_device_h device, void* user_data);
-  static void DeviceFinishCb(int result, void* user_data);
   static bool GroupForeachCb(mdg_device_h device, void* user_data);
   static void GroupInvitedCb(mdg_group_h group, void* user_data);
   void HandlePackageEvent(const std::string& pkgid,