beta3
This commit is contained in:
@@ -66,7 +66,7 @@ echo "[OK]"
|
|||||||
|
|
||||||
echo -n "Building..............."
|
echo -n "Building..............."
|
||||||
rm -rf bin/zec-qt-wallet* > /dev/null
|
rm -rf bin/zec-qt-wallet* > /dev/null
|
||||||
make clean
|
make clean > /dev/null
|
||||||
make -j$(nproc) > /dev/null
|
make -j$(nproc) > /dev/null
|
||||||
echo "[OK]"
|
echo "[OK]"
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
#define APP_VERSION "0.5.7-androidbeta"
|
#define APP_VERSION "0.5.7-androidbeta3"
|
||||||
|
|||||||
@@ -242,7 +242,7 @@ QString AppDataServer::decryptMessage(QJsonDocument msg, QString secretHex, bool
|
|||||||
QString encryptedhex = msg.object().value("payload").toString();
|
QString encryptedhex = msg.object().value("payload").toString();
|
||||||
|
|
||||||
// Enforce limits on the size of the message
|
// 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*/) {
|
encryptedhex.length() > 2 * 50 * 1024 /*50kb*/) {
|
||||||
return "error";
|
return "error";
|
||||||
}
|
}
|
||||||
@@ -456,9 +456,9 @@ void AppDataServer::processSendTx(QJsonObject sendTx, MainWindow* mainwindow, QW
|
|||||||
|
|
||||||
// And send the Tx
|
// And send the Tx
|
||||||
mainwindow->getRPC()->executeTransaction(tx,
|
mainwindow->getRPC()->executeTransaction(tx,
|
||||||
[=] (QString opid) {},
|
[=] (QString) {},
|
||||||
// Submitted Tx successfully
|
// Submitted Tx successfully
|
||||||
[=] (QString opid, QString txid) {
|
[=] (QString, QString txid) {
|
||||||
auto r = QJsonDocument(QJsonObject{
|
auto r = QJsonDocument(QJsonObject{
|
||||||
{"version", 1.0},
|
{"version", 1.0},
|
||||||
{"command", "sendTxSubmitted"},
|
{"command", "sendTxSubmitted"},
|
||||||
@@ -468,7 +468,7 @@ void AppDataServer::processSendTx(QJsonObject sendTx, MainWindow* mainwindow, QW
|
|||||||
pClient->sendTextMessage(encryptOutgoing(r));
|
pClient->sendTextMessage(encryptOutgoing(r));
|
||||||
},
|
},
|
||||||
// Errored while submitting Tx
|
// Errored while submitting Tx
|
||||||
[=] (QString opid, QString errStr) {
|
[=] (QString, QString errStr) {
|
||||||
auto r = QJsonDocument(QJsonObject{
|
auto r = QJsonDocument(QJsonObject{
|
||||||
{"version", 1.0},
|
{"version", 1.0},
|
||||||
{"command", "sendTxFailed"},
|
{"command", "sendTxFailed"},
|
||||||
|
|||||||
Reference in New Issue
Block a user