diff options
| -rwxr-xr-x | build.sh | 10 | ||||
| -rw-r--r-- | monero-wallet-gui.pro | 6 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.cpp | 2 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.h | 2 |
4 files changed, 17 insertions, 3 deletions
@@ -24,14 +24,16 @@ elif [ "$BUILD_TYPE" == "release-static" ]; then BIN_PATH=release/bin elif [ "$BUILD_TYPE" == "release-android" ]; then echo "Building release for ANDROID" - CONFIG="CONFIG+=release static WITH_SCANNER"; + CONFIG="CONFIG+=release static WITH_SCANNER DISABLE_PASS_STRENGTH_METER"; ANDROID=true BIN_PATH=release/bin + DISABLE_PASS_STRENGTH_METER=true elif [ "$BUILD_TYPE" == "debug-android" ]; then echo "Building debug for ANDROID : ultra INSECURE !!" - CONFIG="CONFIG+=debug qml_debug WITH_SCANNER"; + CONFIG="CONFIG+=debug qml_debug WITH_SCANNER DISABLE_PASS_STRENGTH_METER"; ANDROID=true BIN_PATH=debug/bin + DISABLE_PASS_STRENGTH_METER=true elif [ "$BUILD_TYPE" == "debug" ]; then echo "Building debug" CONFIG="CONFIG+=debug" @@ -57,7 +59,9 @@ fi ./get_libwallet_api.sh $BUILD_TYPE # build zxcvbn -$MAKE -C src/zxcvbn-c || exit +if [ "$DISABLE_PASS_STRENGTH_METER" != true ]; then + $MAKE -C src/zxcvbn-c || exit +fi if [ ! -d build ]; then mkdir build; fi diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index d680f890..8e34277d 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -62,6 +62,12 @@ SOURCES += main.cpp \ src/libwalletqt/UnsignedTransaction.cpp \ MainApp.cpp +CONFIG(DISABLE_PASS_STRENGTH_METER) { + HEADERS -= src/zxcvbn-c/zxcvbn.h + SOURCES -= src/zxcvbn-c/zxcvbn.c + DEFINES += "DISABLE_PASS_STRENGTH_METER" +} + !ios { HEADERS += src/daemon/DaemonManager.h SOURCES += src/daemon/DaemonManager.cpp diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index 875e4cca..3b33b8b7 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -304,6 +304,7 @@ QUrl WalletManager::localPathToUrl(const QString &path) const return QUrl::fromLocalFile(path); } +#ifndef DISABLE_PASS_STRENGTH_METER double WalletManager::getPasswordStrength(const QString &password) const { static const char *local_dict[] = { @@ -318,6 +319,7 @@ double WalletManager::getPasswordStrength(const QString &password) const ZxcvbnUnInit(); return e; } +#endif bool WalletManager::saveQrCode(const QString &code, const QString &path) const { diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 7eacc3f0..90c56152 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -128,7 +128,9 @@ public: Q_INVOKABLE qint64 addi(qint64 x, qint64 y) const { return x + y; } Q_INVOKABLE qint64 subi(qint64 x, qint64 y) const { return x - y; } +#ifndef DISABLE_PASS_STRENGTH_METER Q_INVOKABLE double getPasswordStrength(const QString &password) const; +#endif Q_INVOKABLE QString resolveOpenAlias(const QString &address) const; Q_INVOKABLE bool parse_uri(const QString &uri, QString &address, QString &payment_id, uint64_t &amount, QString &tx_description, QString &recipient_name, QVector<QString> &unknown_parameters, QString &error); |