diff options
| author | Kali Kaneko <kali@leap.se> | 2013-10-15 23:27:43 -0300 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-10-15 23:27:43 -0300 |
| commit | 36c36bc9dc9fed643245c9c96a9840f06c515ec1 (patch) | |
| tree | 45369607f53d7150431a22f921d40b18b595c3e8 | |
| parent | 01580ad37a7d000045baccb0a67ebd1f8a4da8be (diff) | |
| parent | f1e2ad174b1d3682ffe2fea36d0fa473ff418d77 (diff) | |
Merge remote-tracking branch 'ivan-github/bug/remove-unused-code' into develop
| -rw-r--r-- | src/leap/bitmask/config/leapsettings.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/wizard.py | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/leap/bitmask/config/leapsettings.py b/src/leap/bitmask/config/leapsettings.py index 0c25648e..d7b60ba9 100644 --- a/src/leap/bitmask/config/leapsettings.py +++ b/src/leap/bitmask/config/leapsettings.py @@ -62,7 +62,6 @@ class LeapSettings(object): GEOMETRY_KEY = "Geometry" WINDOWSTATE_KEY = "WindowState" USER_KEY = "User" - PROPERPROVIDER_KEY = "ProperProvider" REMEMBER_KEY = "RememberUserAndPass" DEFAULTPROVIDER_KEY = "DefaultProvider" AUTOSTARTEIP_KEY = "AutoStartEIP" diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index c715984e..5d7f717b 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -369,7 +369,6 @@ class MainWindow(QtGui.QMainWindow): finishing. """ if self._wizard_firstrun: - self._settings.set_properprovider(False) providers = self._settings.get_configured_providers() has_provider_on_disk = len(providers) != 0 if not has_provider_on_disk: @@ -582,7 +581,6 @@ class MainWindow(QtGui.QMainWindow): self._login_widget.set_password(possible_password) self._login() self._wizard = None - self._settings.set_properprovider(True) else: self._try_autostart_eip() if not self._settings.get_remember(): diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py index e3f5904e..6ba65410 100644 --- a/src/leap/bitmask/gui/wizard.py +++ b/src/leap/bitmask/gui/wizard.py @@ -53,9 +53,6 @@ class Wizard(QtGui.QWizard): REGISTER_USER_PAGE = 4 SERVICES_PAGE = 5 - WEAK_PASSWORDS = ("123456", "qweasd", "qwerty", - "password") - BARE_USERNAME_REGEX = r"^[A-Za-z\d_]+$" def __init__(self, bypass_checks=False): |