diff --git a/TMessagesProj/jni/tgnet/ConnectionSocket.h b/TMessagesProj/jni/tgnet/ConnectionSocket.h index 15ffee898..ced2292ad 100644 --- a/TMessagesProj/jni/tgnet/ConnectionSocket.h +++ b/TMessagesProj/jni/tgnet/ConnectionSocket.h @@ -35,6 +35,12 @@ public: void setOverrideProxy(std::string address, uint16_t port, std::string username, std::string password, std::string secret); void onHostNameResolved(std::string host, std::string ip, bool ipv6); + std::string overrideProxyUser = ""; + std::string overrideProxyPassword = ""; + std::string overrideProxyAddress = ""; + std::string overrideProxySecret = ""; + uint16_t overrideProxyPort = 1080; + protected: int32_t instanceNum; void onEvent(uint32_t events); @@ -46,12 +52,6 @@ protected: virtual void onConnected() = 0; virtual bool hasPendingRequests() = 0; - std::string overrideProxyUser = ""; - std::string overrideProxyPassword = ""; - std::string overrideProxyAddress = ""; - std::string overrideProxySecret = ""; - uint16_t overrideProxyPort = 1080; - private: ByteStream *outgoingByteStream = nullptr; struct epoll_event eventMask; diff --git a/TMessagesProj/jni/tgnet/Handshake.cpp b/TMessagesProj/jni/tgnet/Handshake.cpp index 9f01bc3d3..6be7f20c7 100644 --- a/TMessagesProj/jni/tgnet/Handshake.cpp +++ b/TMessagesProj/jni/tgnet/Handshake.cpp @@ -911,9 +911,9 @@ void Handshake::processHandshakeResponse(TLObject *message, int64_t messageId) { } void Handshake::sendAckRequest(int64_t messageId) { - TL_msgs_ack *msgsAck = new TL_msgs_ack(); + /*TL_msgs_ack *msgsAck = new TL_msgs_ack(); msgsAck->msg_ids.push_back(messageId); - sendRequestData(msgsAck, false); + sendRequestData(msgsAck, false);*/ } TLObject *Handshake::getCurrentHandshakeRequest() {