diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-01-06 17:14:56 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-01-06 17:14:56 -0500 |
| commit | fc131bd46537770359e22ea9275e80e7baad7954 (patch) | |
| tree | ed4894bb3c92dfe50b2178cf583a2c5d423c496f /src | |
| parent | 5268199679aecb2ca4708f157bdd5b59d558e461 (diff) | |
| parent | dab4d5a8d70ff6b90fd26df18f854698f21554f2 (diff) | |
| download | monzero-gui-fc131bd46537770359e22ea9275e80e7baad7954.tar.gz monzero-gui-fc131bd46537770359e22ea9275e80e7baad7954.tar.xz monzero-gui-fc131bd46537770359e22ea9275e80e7baad7954.zip | |
Merge pull request #965
83efc38 Android: Disable password strength meter
0ece8a9 Android dockerfile: add zmq dependency
dab4d5a Android: use new repo path
Diffstat (limited to 'src')
| -rw-r--r-- | src/libwalletqt/WalletManager.cpp | 2 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.h | 2 |
2 files changed, 4 insertions, 0 deletions
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); |