From 0db3d5a4aecc0a3c271b92c6187922c50d46df0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 26 Sep 2014 10:13:44 -0300 Subject: Revert "Fix soledad imports (#5989)." This reverts commit 7fcc4f40eaa8214de8ae20cd71d173337ad64290. --- src/leap/bitmask/backend/components.py | 2 +- src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index d4f6d176..5ef6befd 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -60,7 +60,7 @@ from leap.common import certs as leap_certs from leap.keymanager import openpgp from leap.keymanager.errors import KeyAddressMismatch, KeyFingerprintMismatch -from leap.soledad.client.secrets import NoStorageSecret, PassphraseTooShort +from leap.soledad.client import NoStorageSecret, PassphraseTooShort logger = logging.getLogger(__name__) diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 745645f3..c4e43bfe 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -45,8 +45,7 @@ from leap.common.files import which from leap.keymanager import KeyManager, openpgp from leap.keymanager.errors import KeyNotFound from leap.soledad.common.errors import InvalidAuthTokenError -from leap.soledad.client import Soledad -from leap.soledad.client.secrets import BootstrapSequenceError +from leap.soledad.client import Soledad, BootstrapSequenceError logger = logging.getLogger(__name__) -- cgit v1.2.3 From 7cb332c84eaef651cb614b2e2b9a49d6ff05ac42 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Mon, 6 Oct 2014 11:52:56 -0300 Subject: Replace triple dot character with 3 dots. The string was unicode and the conversion was troublesome, was displayed badly on transifex. --- src/leap/bitmask/gui/mail_status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py index d523f449..92e1e4c4 100644 --- a/src/leap/bitmask/gui/mail_status.py +++ b/src/leap/bitmask/gui/mail_status.py @@ -228,7 +228,7 @@ class MailStatusWidget(QtGui.QWidget): self._service_name)) elif ready == 1: icon = self.CONNECTING_ICON - self._mx_status = self.tr('Starting…') + self._mx_status = self.tr('Starting...') tray_status = self.tr('Mail is starting') elif ready >= 2: icon = self.CONNECTED_ICON -- cgit v1.2.3 From 45b6bbb1e3b710fe975d1627a9dbb4e89369bb50 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 7 Oct 2014 17:01:14 -0300 Subject: Fix typos on strings and remove unused button. This was reported by the user 'strel' on transifex. --- src/leap/bitmask/gui/advanced_key_management.py | 2 +- src/leap/bitmask/gui/eip_status.py | 4 ++-- src/leap/bitmask/gui/ui/preferences_email_page.ui | 13 ------------- 3 files changed, 3 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/gui/advanced_key_management.py b/src/leap/bitmask/gui/advanced_key_management.py index b3a4ed8e..48a1db93 100644 --- a/src/leap/bitmask/gui/advanced_key_management.py +++ b/src/leap/bitmask/gui/advanced_key_management.py @@ -121,7 +121,7 @@ class AdvancedKeyManagement(QtGui.QDialog): if file_name: question = self.tr("Are you sure that you want to replace " - "the current key pair whith the imported?") + "the current key pair with the imported?") res = QtGui.QMessageBox.question( None, "Change key pair", question, QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index a5cd03d3..14ff5972 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -741,8 +741,8 @@ class EIPStatusWidget(QtGui.QWidget): # XXX this should change to polkit-kde where # applicable. self.tr("We could not find any authentication agent in your " - "system.
Make sure you have" - "polkit-gnome-authentication-agent-1 running and" + "system.
Make sure you have " + "polkit-gnome-authentication-agent-1 running and " "try again."), error=True) self.set_eipstatus_off() diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui index 41b3c28d..7cc5bb3c 100644 --- a/src/leap/bitmask/gui/ui/preferences_email_page.ui +++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui @@ -13,19 +13,6 @@ Form - - - - 250 - 210 - 98 - 27 - - - - PushButton - - -- cgit v1.2.3 From 98af9c20e0582a113133613b673552236e920be9 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 21 Oct 2014 15:56:39 -0300 Subject: Better error message for PostLimitError. Suggested by user 'kingu' on transifex. --- src/leap/bitmask/gui/loggerwindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py index 360dd5f0..463d2412 100644 --- a/src/leap/bitmask/gui/loggerwindow.py +++ b/src/leap/bitmask/gui/loggerwindow.py @@ -225,7 +225,7 @@ class LoggerWindow(QtGui.QDialog): msg = self.tr("Sending logs to Pastebin failed!") if isinstance(failure, pastebin.PostLimitError): - msg = self.tr('Maximum posts per day reached') + msg = self.tr('Maximum amount of submissions reached for today.') # We save the dialog in an instance member to avoid dialog being # deleted right after we exit this method -- cgit v1.2.3 From 06cbda963118c7087f12b4f0cd0553da44d64c43 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 3 Nov 2014 12:13:58 +0100 Subject: freeze debian version --- src/leap/bitmask/_version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/_version.py b/src/leap/bitmask/_version.py index c9c934a0..ecd51c2e 100644 --- a/src/leap/bitmask/_version.py +++ b/src/leap/bitmask/_version.py @@ -5,8 +5,8 @@ # unpacked source archive. Distribution tarballs contain a pre-generated copy # of this file. -version_version = '0.7.0-rc1' -version_full = 'f7da7ebb24e1a1c1f65cd257e949c0aa7ff23781' +version_version = '0.7.0rc3' +version_full = '0fc71d08381c7e750dabc2fc6cf5ef957d51bb5a' def get_versions(default={}, verbose=False): -- cgit v1.2.3 From 571fd912925a76ab35c55b7906d774363b51ce37 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 7 Nov 2014 20:14:51 +0100 Subject: Do not use logger.exception during provider checks. Closes: #6219 leap log handler was choking on the captured exception. it might have to do with the exception unwinding made by the reactor. this is a workaround to allow the provider checks to show a meaningful error message. The backtrace should only be there for development purpuses, so removing it. --- src/leap/bitmask/provider/providerbootstrapper.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/provider/providerbootstrapper.py b/src/leap/bitmask/provider/providerbootstrapper.py index 71edbb87..8eefb9d9 100644 --- a/src/leap/bitmask/provider/providerbootstrapper.py +++ b/src/leap/bitmask/provider/providerbootstrapper.py @@ -148,7 +148,6 @@ class ProviderBootstrapper(AbstractBootstrapper): timeout=REQUEST_TIMEOUT) res.raise_for_status() except requests.exceptions.SSLError as exc: - logger.exception(exc) self._err_msg = self.tr("Provider certificate could " "not be verified") raise @@ -156,7 +155,6 @@ class ProviderBootstrapper(AbstractBootstrapper): # XXX careful!. The error might be also a SSL handshake # timeout error, in which case we should retry a couple of times # more, for cases where the ssl server gives high latencies. - logger.exception(exc) self._err_msg = self.tr("Provider does not support HTTPS") raise -- cgit v1.2.3 From bb17bf8295d04d4834246b0f30244933429dc247 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 7 Nov 2014 20:19:01 +0100 Subject: Fix compatibilty with newest openssl. Closes: #6133 Newest OpenSSL expect cafile to be None or byte stream (was retunrning unicode) --- src/leap/bitmask/config/providerconfig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/leap/bitmask/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py index 57bc3a98..386c697d 100644 --- a/src/leap/bitmask/config/providerconfig.py +++ b/src/leap/bitmask/config/providerconfig.py @@ -201,7 +201,8 @@ class ProviderConfig(BaseConfig): leap_check(cert_exists, error_msg, MissingCACert) logger.debug("Going to verify SSL against %s" % (cert_path,)) - return cert_path + # OpenSSL does not handle unicode. + return cert_path.encode('utf-8') def provides_eip(self): """ -- cgit v1.2.3 From 7f393dbb940e7cbc77406369c57c7ded52765f4b Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 10 Nov 2014 16:05:15 +0100 Subject: freeze debian version --- src/leap/bitmask/_version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/_version.py b/src/leap/bitmask/_version.py index ecd51c2e..59a59fa3 100644 --- a/src/leap/bitmask/_version.py +++ b/src/leap/bitmask/_version.py @@ -5,8 +5,8 @@ # unpacked source archive. Distribution tarballs contain a pre-generated copy # of this file. -version_version = '0.7.0rc3' -version_full = '0fc71d08381c7e750dabc2fc6cf5ef957d51bb5a' +version_version = '0.7.0rc4' +version_full = 'ed2274b7d90a9b487f201355d16507f98aead905' def get_versions(default={}, verbose=False): -- cgit v1.2.3