diff --git a/src/adapter_group.cc b/src/adapter_group.cc index a56a4a6..d34c113 100644 --- a/src/adapter_group.cc +++ b/src/adapter_group.cc @@ -18,7 +18,14 @@ using namespace std; using namespace pEp; //Listmanager config -string lm_dummy_db_path = "listman_dummy.db"; +string lm_dummy_db_filename = "listman_dummy.db"; + +#ifdef WIN32 +string lm_dummy_db_path = string(::per_user_directory()) + "\\" + listman_db_filename; +#else +string lm_dummy_db_path = string(::per_user_directory()) + "/" + lm_dummy_db_filename; +#endif + /************************************************************************************************* * Group management functions @@ -27,32 +34,26 @@ string lm_dummy_db_path = "listman_dummy.db"; GroupUpdateDriverEngine group_update_driver_engine{}; GroupUpdateInterface *gu_engine = &group_update_driver_engine; // Listmanager Driver -GroupUpdateDriverDummy group_update_driver_dummy{lm_dummy_db_path}; +GroupUpdateDriverDummy group_update_driver_dummy{ lm_dummy_db_path }; GroupUpdateInterface *gu_listman = &group_update_driver_dummy; DYNAMIC_API PEP_STATUS adapter_group_create( PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager, - identity_list *memberlist, - pEp_group **group) + identity_list *memberlist) { pEpLog("called"); // Do listmanager - PEP_STATUS status = gu_listman->adapter_group_create( - session, - group_identity, - manager, - memberlist, - group); + PEP_STATUS status = gu_listman->adapter_group_create(session, group_identity, manager, memberlist); if (status != PEP_STATUS_OK) { return status; } // Do engine - status = gu_engine->adapter_group_create(session, group_identity, manager, memberlist, group); + status = gu_engine->adapter_group_create(session, group_identity, manager, memberlist); if (status != PEP_STATUS_OK) { // Rollback listman PEP_STATUS rb_stat = gu_listman->adapter_group_dissolve(session, group_identity, manager); @@ -169,7 +170,7 @@ PEP_STATUS adapter_group_remove_member( * Group query functions *************************************************************************************************/ // Listmanager Driver -GroupQueryDriverDummy group_query_driver_dummy{lm_dummy_db_path}; +GroupQueryDriverDummy group_query_driver_dummy{ lm_dummy_db_path }; GroupQueryInterface *gq_listman = &group_query_driver_dummy; DYNAMIC_API PEP_STATUS group_query_groups(PEP_SESSION session, identity_list **groups) diff --git a/src/adapter_group.h b/src/adapter_group.h index 33fa004..1d8f6c4 100644 --- a/src/adapter_group.h +++ b/src/adapter_group.h @@ -37,9 +37,6 @@ extern "C" { * a user_id and address, and there must be a default key for the manager * present in the database * @param[in,out] member_ident_list list of group member identities - * @param[in,out] group Optional reference for pointer to group object - * representing the created group. - * (When input is NULL, no object is created) * * @retval PEP_STATUS_OK on success * error on failure @@ -58,9 +55,7 @@ DYNAMIC_API PEP_STATUS adapter_group_create( PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager, - identity_list *memberlist, - pEp_group **group -); + identity_list *memberlist); /** @@ -84,11 +79,8 @@ DYNAMIC_API PEP_STATUS adapter_group_create( * * */ -DYNAMIC_API PEP_STATUS adapter_group_join( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *as_member -); +DYNAMIC_API PEP_STATUS +adapter_group_join(PEP_SESSION session, pEp_identity *group_identity, pEp_identity *as_member); /** * @@ -111,11 +103,8 @@ DYNAMIC_API PEP_STATUS adapter_group_join( * @warning For recipients to accept the dissolution, the sender/manager key used must be a key that they * have a trust entry for. */ -DYNAMIC_API PEP_STATUS adapter_group_dissolve( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *manager -); +DYNAMIC_API PEP_STATUS +adapter_group_dissolve(PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager); /** * @@ -140,10 +129,9 @@ DYNAMIC_API PEP_STATUS adapter_group_dissolve( * */ DYNAMIC_API PEP_STATUS adapter_group_invite_member( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *group_member -); + PEP_SESSION session, + pEp_identity *group_identity, + pEp_identity *group_member); /** * @@ -166,10 +154,9 @@ DYNAMIC_API PEP_STATUS adapter_group_invite_member( * */ PEP_STATUS adapter_group_remove_member( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *group_member -); + PEP_SESSION session, + pEp_identity *group_identity, + pEp_identity *group_member); /************************************************************************************************* @@ -210,11 +197,8 @@ DYNAMIC_API PEP_STATUS group_query_groups(PEP_SESSION session, identity_list **g * */ -DYNAMIC_API PEP_STATUS group_query_manager( - PEP_SESSION session, - const pEp_identity *const group, - pEp_identity **manager -); +DYNAMIC_API PEP_STATUS +group_query_manager(PEP_SESSION session, const pEp_identity *const group, pEp_identity **manager); /** * @@ -232,15 +216,12 @@ DYNAMIC_API PEP_STATUS group_query_manager( * */ -DYNAMIC_API PEP_STATUS group_query_members( - PEP_SESSION session, - const pEp_identity *const group, - identity_list **members -); +DYNAMIC_API PEP_STATUS +group_query_members(PEP_SESSION session, const pEp_identity *const group, identity_list **members); #ifdef __cplusplus }; #endif -#endif //LIBPEPADAPTER_GROUP_HH \ No newline at end of file +#endif //LIBPEPADAPTER_GROUP_HH \ No newline at end of file diff --git a/src/grp_update_drv_dummy.cc b/src/grp_update_drv_dummy.cc index b9ec5d5..45e3472 100644 --- a/src/grp_update_drv_dummy.cc +++ b/src/grp_update_drv_dummy.cc @@ -18,13 +18,12 @@ namespace pEp { PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager, - identity_list *memberlist, - pEp_group **group) + identity_list *memberlist) { pEpLogClass("called"); string addr_list = group_identity->address; string addr_manager = manager->address; - lmd.list_add(addr_list,addr_manager); + lmd.list_add(addr_list, addr_manager); // TODO:ADD MEMBERLIST return PEP_STATUS_OK; diff --git a/src/grp_update_drv_dummy.hh b/src/grp_update_drv_dummy.hh index 9a7447b..38dbcd8 100644 --- a/src/grp_update_drv_dummy.hh +++ b/src/grp_update_drv_dummy.hh @@ -12,14 +12,13 @@ namespace pEp { class GroupUpdateDriverDummy : public GroupUpdateInterface { public: GroupUpdateDriverDummy() = delete; - GroupUpdateDriverDummy(const std::string& db_path); + GroupUpdateDriverDummy(const std::string &db_path); PEP_STATUS adapter_group_create( PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager, - identity_list *memberlist, - pEp_group **group) override; + identity_list *memberlist) override; PEP_STATUS adapter_group_join( PEP_SESSION session, diff --git a/src/grp_update_drv_engine.cc b/src/grp_update_drv_engine.cc index 37cf572..6d2f0a9 100644 --- a/src/grp_update_drv_engine.cc +++ b/src/grp_update_drv_engine.cc @@ -12,11 +12,10 @@ namespace pEp { PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager, - identity_list *memberlist, - pEp_group **group) + identity_list *memberlist) { pEpLogClass("called"); - return ::group_create(session, group_identity, manager, memberlist, group); + return ::group_create(session, group_identity, manager, memberlist, nullptr); } PEP_STATUS GroupUpdateDriverEngine::adapter_group_join( diff --git a/src/grp_update_drv_engine.hh b/src/grp_update_drv_engine.hh index d2c67c5..4bfde72 100644 --- a/src/grp_update_drv_engine.hh +++ b/src/grp_update_drv_engine.hh @@ -15,8 +15,7 @@ namespace pEp { PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager, - identity_list *memberlist, - pEp_group **group) override; + identity_list *memberlist) override; PEP_STATUS adapter_group_join( PEP_SESSION session, diff --git a/src/grp_update_interface.hh b/src/grp_update_interface.hh index 820ae16..7e14b3a 100644 --- a/src/grp_update_interface.hh +++ b/src/grp_update_interface.hh @@ -14,8 +14,7 @@ namespace pEp { PEP_SESSION session, pEp_identity *group_identity, pEp_identity *manager, - identity_list *memberlist, - pEp_group **group) = 0; + identity_list *memberlist) = 0; virtual PEP_STATUS adapter_group_join( PEP_SESSION session, diff --git a/test/framework/framework.cc b/test/framework/framework.cc index 51b1618..322b102 100644 --- a/test/framework/framework.cc +++ b/test/framework/framework.cc @@ -24,14 +24,14 @@ #include "../../src/Adapter.hh" pEp::Test::Transport pEp::Test::transport; -std::string pEp::Test::path; -extern std::thread pEp::Adapter::_sync_thread; using namespace pEp; using namespace std; namespace pEp { namespace Test { + string per_user_dir; + void setup(vector &args) { #ifdef WIN32 @@ -67,8 +67,8 @@ namespace pEp { #else setenv("HOME", _path, 1); #endif - path = _path; - cerr << "test directory: " << path << endl; + per_user_dir = _path; + cerr << "test directory: " << per_user_dir << endl; } void setup(int argc, char **argv) @@ -135,7 +135,13 @@ namespace pEp { stringlist_t *keylist; ::PEP_rating rating; ::PEP_decrypt_flags_t flags = 0; - ::PEP_STATUS status = ::decrypt_message(Adapter::session(), msg.get(), &_dst, &keylist, &rating, &flags); + ::PEP_STATUS status = ::decrypt_message( + Adapter::session(), + msg.get(), + &_dst, + &keylist, + &rating, + &flags); throw_status(status); Message dst; diff --git a/test/framework/framework.hh b/test/framework/framework.hh index 1bc3a37..9e15ac0 100644 --- a/test/framework/framework.hh +++ b/test/framework/framework.hh @@ -55,7 +55,7 @@ namespace pEp { }; extern Transport transport; - extern std::string path; + extern std::string per_user_dir; }; // namespace Test }; // namespace pEp