Browse Source

beta3

pull/45/head
Aditya Kulkarni 5 years ago
parent
commit
9c71568dbd
  1. 2
      src/scripts/mkrelease.sh
  2. 2
      src/version.h
  3. 8
      src/websockets.cpp

2
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]"

2
src/version.h

@ -1 +1 @@
#define APP_VERSION "0.5.7-androidbeta"
#define APP_VERSION "0.5.7-androidbeta3"

8
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"},

Loading…
Cancel
Save