github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-11-28 09:31:37 +01:00
Code Releases Activity

Android: Disable password strength meter

Browse Source
This commit is contained in:
MoroccanMalinois 2017-12-24 01:29:08 +00:00
parent 64ce0e62e2
commit 83efc3893b
No known key found for this signature in database
GPG Key ID: A63BDCF76B8B38BD
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sh
View File

@ -24,14 +24,16 @@ elif [ "$BUILD_TYPE" == "release-static" ]; then
BIN_PATH=release/bin BIN_PATH=release/bin
elif [ "$BUILD_TYPE" == "release-android" ]; then elif [ "$BUILD_TYPE" == "release-android" ]; then
echo "Building release for ANDROID" echo "Building release for ANDROID"
CONFIG="CONFIG+=release static WITH_SCANNER"; CONFIG="CONFIG+=release static WITH_SCANNER DISABLE_PASS_STRENGTH_METER";
ANDROID=true ANDROID=true
BIN_PATH=release/bin BIN_PATH=release/bin
DISABLE_PASS_STRENGTH_METER=true
elif [ "$BUILD_TYPE" == "debug-android" ]; then elif [ "$BUILD_TYPE" == "debug-android" ]; then
echo "Building debug for ANDROID : ultra INSECURE !!" 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 ANDROID=true
BIN_PATH=debug/bin BIN_PATH=debug/bin
DISABLE_PASS_STRENGTH_METER=true
elif [ "$BUILD_TYPE" == "debug" ]; then elif [ "$BUILD_TYPE" == "debug" ]; then
echo "Building debug" echo "Building debug"
CONFIG="CONFIG+=debug" CONFIG="CONFIG+=debug"
@ -57,7 +59,9 @@ fi
./get_libwallet_api.sh $BUILD_TYPE ./get_libwallet_api.sh $BUILD_TYPE
# build zxcvbn # 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 if [ ! -d build ]; then mkdir build; fi

6
monero-wallet-gui.pro
View File

@ -62,6 +62,12 @@ SOURCES += main.cpp \
src/libwalletqt/UnsignedTransaction.cpp \ src/libwalletqt/UnsignedTransaction.cpp \
MainApp.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 { !ios {
HEADERS += src/daemon/DaemonManager.h HEADERS += src/daemon/DaemonManager.h
SOURCES += src/daemon/DaemonManager.cpp SOURCES += src/daemon/DaemonManager.cpp

2
src/libwalletqt/WalletManager.cpp
View File

@ -304,6 +304,7 @@ QUrl WalletManager::localPathToUrl(const QString &path) const
return QUrl::fromLocalFile(path); return QUrl::fromLocalFile(path);
} }
#ifndef DISABLE_PASS_STRENGTH_METER
double WalletManager::getPasswordStrength(const QString &password) const double WalletManager::getPasswordStrength(const QString &password) const
{ {
static const char *local_dict[] = { static const char *local_dict[] = {
@ -318,6 +319,7 @@ double WalletManager::getPasswordStrength(const QString &password) const
ZxcvbnUnInit(); ZxcvbnUnInit();
return e; return e;
} }
#endif
bool WalletManager::saveQrCode(const QString &code, const QString &path) const bool WalletManager::saveQrCode(const QString &code, const QString &path) const
{ {

2
src/libwalletqt/WalletManager.h
View File

@ -128,7 +128,9 @@ public:
Q_INVOKABLE qint64 addi(qint64 x, qint64 y) const { return x + y; } Q_INVOKABLE qint64 addi(qint64 x, qint64 y) const { return x + y; }
Q_INVOKABLE qint64 subi(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; Q_INVOKABLE double getPasswordStrength(const QString &password) const;
#endif
Q_INVOKABLE QString resolveOpenAlias(const QString &address) const; 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); 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);