diff --git a/libretroshare/src/pqi/pqinetwork.cc b/libretroshare/src/pqi/pqinetwork.cc index a3f4ac47f..e2251ed6a 100644 --- a/libretroshare/src/pqi/pqinetwork.cc +++ b/libretroshare/src/pqi/pqinetwork.cc @@ -26,6 +26,10 @@ # include #endif // WINDOWS_SYS +#ifdef __ANDROID__ +# include +#endif // def __ANDROID__ + #include "pqi/pqinetwork.h" #include "util/rsnet.h" @@ -272,7 +276,7 @@ int inet_aton(const char *name, struct in_addr *addr) # include # include # pragma comment(lib, "IPHLPAPI.lib") -#elif defined(__ANDROID__) +#elif defined(__ANDROID__) && __ANDROID_API__ < 24 # include # include # include @@ -320,7 +324,7 @@ bool getLocalAddresses(std::vector& addrs) } } free(adapter_addresses); -#elif defined(__ANDROID__) +#elif defined(__ANDROID__) && __ANDROID_API__ < 24 foreach(QHostAddress qAddr, QNetworkInterface::allAddresses()) { sockaddr_storage tmpAddr; diff --git a/libretroshare/src/services/p3gxscircles.cc b/libretroshare/src/services/p3gxscircles.cc index 3087fe4c6..ca599d85b 100644 --- a/libretroshare/src/services/p3gxscircles.cc +++ b/libretroshare/src/services/p3gxscircles.cc @@ -223,6 +223,9 @@ bool p3GxsCircles::createCircle( cData.mMeta.mAuthorId = authorId; cData.mMeta.mCircleType = static_cast(circleType); cData.mMeta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC; + cData.mMeta.mCircleId = restrictedId; + cData.mLocalFriends = localMembers; + cData.mInvitedMembers = gxsIdMembers; uint32_t token; createGroup(token, cData); diff --git a/libretroshare/src/services/rseventsservice.cc b/libretroshare/src/services/rseventsservice.cc index b970e26e7..2dfc12d48 100644 --- a/libretroshare/src/services/rseventsservice.cc +++ b/libretroshare/src/services/rseventsservice.cc @@ -120,7 +120,7 @@ bool RsEventsService::unregisterEventsHandler(RsEventsHandlerId_t hId) void RsEventsService::data_tick() { auto nextRunAt = std::chrono::system_clock::now() + - std::chrono::milliseconds(1); + std::chrono::milliseconds(200); std::shared_ptr eventPtr(nullptr); size_t futureEventsCounter = 0;