Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from RetroShare/master

Browse Source 
update
This commit is contained in:
defnax 2019-09-27 20:07:31 +02:00 committed by GitHub
commit b50322cb3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretroshare/src/pqi/pqinetwork.cc
View File

@ -26,6 +26,10 @@
# include <ws2tcpip.h> # include <ws2tcpip.h>
#endif // WINDOWS_SYS #endif // WINDOWS_SYS
#ifdef __ANDROID__
# include <android/api-level.h>
#endif // def __ANDROID__
#include "pqi/pqinetwork.h" #include "pqi/pqinetwork.h"
#include "util/rsnet.h" #include "util/rsnet.h"
@ -272,7 +276,7 @@ int inet_aton(const char *name, struct in_addr *addr)
# include <winsock2.h> # include <winsock2.h>
# include <iphlpapi.h> # include <iphlpapi.h>
# pragma comment(lib, "IPHLPAPI.lib") # pragma comment(lib, "IPHLPAPI.lib")
#elif defined(__ANDROID__) #elif defined(__ANDROID__) && __ANDROID_API__ < 24
# include <string> # include <string>
# include <QString> # include <QString>
# include <QHostAddress> # include <QHostAddress>
@ -320,7 +324,7 @@ bool getLocalAddresses(std::vector<sockaddr_storage>& addrs)
} }
} }
free(adapter_addresses); free(adapter_addresses);
#elif defined(__ANDROID__) #elif defined(__ANDROID__) && __ANDROID_API__ < 24
foreach(QHostAddress qAddr, QNetworkInterface::allAddresses()) foreach(QHostAddress qAddr, QNetworkInterface::allAddresses())
{ {
sockaddr_storage tmpAddr; sockaddr_storage tmpAddr;

3
libretroshare/src/services/p3gxscircles.cc
View File

@ -223,6 +223,9 @@ bool p3GxsCircles::createCircle(
cData.mMeta.mAuthorId = authorId; cData.mMeta.mAuthorId = authorId;
cData.mMeta.mCircleType = static_cast<uint32_t>(circleType); cData.mMeta.mCircleType = static_cast<uint32_t>(circleType);
cData.mMeta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC; cData.mMeta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC;
cData.mMeta.mCircleId = restrictedId;
cData.mLocalFriends = localMembers;
cData.mInvitedMembers = gxsIdMembers;
uint32_t token; uint32_t token;
createGroup(token, cData); createGroup(token, cData);

2
libretroshare/src/services/rseventsservice.cc
View File

@ -120,7 +120,7 @@ bool RsEventsService::unregisterEventsHandler(RsEventsHandlerId_t hId)
void RsEventsService::data_tick() void RsEventsService::data_tick()
{ {
auto nextRunAt = std::chrono::system_clock::now() + auto nextRunAt = std::chrono::system_clock::now() +
std::chrono::milliseconds(1); std::chrono::milliseconds(200);
std::shared_ptr<const RsEvent> eventPtr(nullptr); std::shared_ptr<const RsEvent> eventPtr(nullptr);
size_t futureEventsCounter = 0; size_t futureEventsCounter = 0;