diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-04-25 11:32:03 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-04-25 11:32:03 -0300 |
| commit | 55d4f043ee457bc780c7ea37a6b8ded448b0abdd (patch) | |
| tree | 5698b25fff491f1b06f70f9263469ca7a9337b58 | |
| parent | aea6497de6b82610db7159453528a38d848a7a31 (diff) | |
| parent | 58a1381764b16ebe01639020c73d4c96632cadfa (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/5563_download-upload-backward' into develop
| -rw-r--r-- | changes/bug-5563_download-upload-backward | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/backend.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/eip_status.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/vpnprocess.py | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/changes/bug-5563_download-upload-backward b/changes/bug-5563_download-upload-backward new file mode 100644 index 00000000..d5288c02 --- /dev/null +++ b/changes/bug-5563_download-upload-backward @@ -0,0 +1 @@ +- Download/upload rates were displayed backwards in the widget rate. Closes #5563. diff --git a/src/leap/bitmask/backend.py b/src/leap/bitmask/backend.py index d5a8a4e9..054aec85 100644 --- a/src/leap/bitmask/backend.py +++ b/src/leap/bitmask/backend.py @@ -1040,7 +1040,7 @@ class Backend(object): eip_process_restart_ping eip_process_restart_tls eip_state_changed -> str - eip_status_changed -> str + eip_status_changed -> tuple of str (download, upload) eip_vpn_launcher_exception """ self._call_queue.put(("eip", "start", None)) diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index 0d75b8e5..bc31b91d 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -359,8 +359,8 @@ class EIPStatusWidget(QtGui.QWidget): If data is None, we just will refresh the display based on the previous data. - :param data: a dictionary with the tcp/udp write and read totals. - :type data: dict + :param data: a tuple with download/upload totals (download, upload). + :type data: tuple """ if data is not None: try: diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py index a9444489..c7b8071c 100644 --- a/src/leap/bitmask/services/eip/vpnprocess.py +++ b/src/leap/bitmask/services/eip/vpnprocess.py @@ -541,11 +541,11 @@ class VPNManager(object): # "Auth read bytes" if text == "TUN/TAP read bytes": - tun_tap_read = value + tun_tap_read = value # download elif text == "TUN/TAP write bytes": - tun_tap_write = value + tun_tap_write = value # upload - status = (tun_tap_write, tun_tap_read) + status = (tun_tap_read, tun_tap_write) if status != self._last_status: self._signaler.signal(self._signaler.EIP_STATUS_CHANGED, status) self._last_status = status |