ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix another bug

Browse Source
This commit is contained in:
Michael Zanetti 2017-10-27 18:51:33 +02:00
parent 403a78d029
commit 0078bd1d0c
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libguh-core/awsconnector.cpp
View File

@ -118,11 +118,6 @@ void AWSConnector::onConnected()
// OK, we're registerd already, go straight to pairing setup // OK, we're registerd already, go straight to pairing setup
setupPairing(); setupPairing();
// // TODO: remove this again. just using this for testing now
// QStringList subscriptions;
// subscriptions.append(QString("eu-west-1:%1/%2/#").arg("7127d36f-9644-455c-bb14-4a23bfac65fe").arg(m_clientId));
// subscribe(subscriptions);
} }
void AWSConnector::registerDevice() void AWSConnector::registerDevice()
@ -372,7 +367,7 @@ ResponseCode AWSConnector::onSubscriptionReceivedCallback(util::String topic_nam
} else if (!userId.isEmpty()) { } else if (!userId.isEmpty()) {
qCDebug(dcAWS()) << "Pairing response for id:" << userId << statusCode; qCDebug(dcAWS()) << "Pairing response for id:" << userId << statusCode;
emit connector->devicePaired(userId, statusCode, message); emit connector->devicePaired(userId, statusCode, message);
connector->subscribe({QString("eu-west-1:%1/listeningPeer/#").arg(userId)}); connector->subscribe({QString("%1/%2/#").arg(connector->m_clientId).arg(userId)});
} else { } else {
qCWarning(dcAWS()) << "Received a pairing response for a transaction we didn't start"; qCWarning(dcAWS()) << "Received a pairing response for a transaction we didn't start";
} }

2
libguh-core/jsonrpc/jsonrpcserver.cpp
View File

@ -263,7 +263,6 @@ JsonReply *JsonRPCServer::RemoveToken(const QVariantMap &params)
JsonReply *JsonRPCServer::SetupRemoteAccess(const QVariantMap &params) JsonReply *JsonRPCServer::SetupRemoteAccess(const QVariantMap &params)
{ {
qWarning() << "SetupRemoteAccess called";
QString idToken = params.value("idToken").toString(); QString idToken = params.value("idToken").toString();
QString userId = params.value("userId").toString(); QString userId = params.value("userId").toString();
GuhCore::instance()->cloudManager()->pairDevice(idToken, userId); GuhCore::instance()->cloudManager()->pairDevice(idToken, userId);
@ -375,7 +374,6 @@ void JsonRPCServer::setup()
void JsonRPCServer::processData(const QUuid &clientId, const QByteArray &data) void JsonRPCServer::processData(const QUuid &clientId, const QByteArray &data)
{ {
qCDebug(dcJsonRpcTraffic()) << "Incoming data:" << data; qCDebug(dcJsonRpcTraffic()) << "Incoming data:" << data;
qWarning() << "***F*f+DSF*DA*a+FD*SF*f+ASDF*S";
TransportInterface *interface = qobject_cast<TransportInterface *>(sender()); TransportInterface *interface = qobject_cast<TransportInterface *>(sender());
QJsonParseError error; QJsonParseError error;

2
libguh-core/tcpserver.cpp
View File

@ -225,13 +225,11 @@ void SslServer::onSocketReadyRead()
m_receiveBuffer.append(socket->readAll()); m_receiveBuffer.append(socket->readAll());
int splitIndex = m_receiveBuffer.indexOf("}\n{"); int splitIndex = m_receiveBuffer.indexOf("}\n{");
while (splitIndex > -1) { while (splitIndex > -1) {
qWarning() << "******" << "emitting dataAcailable" << splitIndex;
emit dataAvailable(socket, m_receiveBuffer.left(splitIndex + 1)); emit dataAvailable(socket, m_receiveBuffer.left(splitIndex + 1));
m_receiveBuffer = m_receiveBuffer.right(m_receiveBuffer.length() - splitIndex - 2); m_receiveBuffer = m_receiveBuffer.right(m_receiveBuffer.length() - splitIndex - 2);
splitIndex = m_receiveBuffer.indexOf("}\n{"); splitIndex = m_receiveBuffer.indexOf("}\n{");
} }
if (m_receiveBuffer.endsWith("}\n")) { if (m_receiveBuffer.endsWith("}\n")) {
qWarning() << "*********" << "emitting dataAvailable" << m_receiveBuffer;
emit dataAvailable(socket, m_receiveBuffer); emit dataAvailable(socket, m_receiveBuffer);
m_receiveBuffer.clear(); m_receiveBuffer.clear();
} }