From 9c71568dbdfa88b64132a366c50a2c9ba2ed459c Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Mon, 4 Feb 2019 09:36:59 -0800 Subject: [PATCH] beta3 --- src/scripts/mkrelease.sh | 2 +- src/version.h | 2 +- src/websockets.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh index f3eec56..1b42ed5 100755 --- a/src/scripts/mkrelease.sh +++ b/src/scripts/mkrelease.sh @@ -66,7 +66,7 @@ echo "[OK]" echo -n "Building..............." rm -rf bin/zec-qt-wallet* > /dev/null -make clean +make clean > /dev/null make -j$(nproc) > /dev/null echo "[OK]" diff --git a/src/version.h b/src/version.h index edfe526..46fd224 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define APP_VERSION "0.5.7-androidbeta" +#define APP_VERSION "0.5.7-androidbeta3" diff --git a/src/websockets.cpp b/src/websockets.cpp index d0426fc..19adab2 100644 --- a/src/websockets.cpp +++ b/src/websockets.cpp @@ -242,7 +242,7 @@ QString AppDataServer::decryptMessage(QJsonDocument msg, QString secretHex, bool QString encryptedhex = msg.object().value("payload").toString(); // Enforce limits on the size of the message - if (noncehex.length() > crypto_secretbox_NONCEBYTES * 2 || + if (noncehex.length() > ((int)crypto_secretbox_NONCEBYTES * 2) || encryptedhex.length() > 2 * 50 * 1024 /*50kb*/) { return "error"; } @@ -456,9 +456,9 @@ void AppDataServer::processSendTx(QJsonObject sendTx, MainWindow* mainwindow, QW // And send the Tx mainwindow->getRPC()->executeTransaction(tx, - [=] (QString opid) {}, + [=] (QString) {}, // Submitted Tx successfully - [=] (QString opid, QString txid) { + [=] (QString, QString txid) { auto r = QJsonDocument(QJsonObject{ {"version", 1.0}, {"command", "sendTxSubmitted"}, @@ -468,7 +468,7 @@ void AppDataServer::processSendTx(QJsonObject sendTx, MainWindow* mainwindow, QW pClient->sendTextMessage(encryptOutgoing(r)); }, // Errored while submitting Tx - [=] (QString opid, QString errStr) { + [=] (QString, QString errStr) { auto r = QJsonDocument(QJsonObject{ {"version", 1.0}, {"command", "sendTxFailed"},