diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-01-31 17:45:21 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-01-31 17:45:21 +0100 |
| commit | 6d8a143adc28c7b9c1434b117f21c147667e4f26 (patch) | |
| tree | fc387d8931f6224e86461cb0d05e63ac45a0c132 /src/de/blinkt/openvpn/OpenVpnManagementThread.java | |
| parent | 249f750a6273a690b2e013bc17fbeba81223d0eb (diff) | |
Allow finer control of notification messages
Diffstat (limited to 'src/de/blinkt/openvpn/OpenVpnManagementThread.java')
| -rw-r--r-- | src/de/blinkt/openvpn/OpenVpnManagementThread.java | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/de/blinkt/openvpn/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/OpenVpnManagementThread.java index 3d68d943..dd3708cf 100644 --- a/src/de/blinkt/openvpn/OpenVpnManagementThread.java +++ b/src/de/blinkt/openvpn/OpenVpnManagementThread.java @@ -290,24 +290,12 @@ public class OpenVpnManagementThread implements Runnable { mLastIn=in;
mLastOut=out;
- String netstat = String.format("In: %8s, %8s/s Out %8s, %8s/s",
- humanReadableByteCount(in, false),
- humanReadableByteCount(diffin, false),
- humanReadableByteCount(out, false),
- humanReadableByteCount(diffout, false));
- OpenVPN.updateStateString("BYTECOUNT",netstat);
+ OpenVPN.updateByteCount(in,out,diffin, diffout);
}
- // From: http://stackoverflow.com/questions/3758606/how-to-convert-byte-size-into-human-readable-format-in-java
- public static String humanReadableByteCount(long bytes, boolean si) {
- int unit = si ? 1000 : 1024;
- if (bytes < unit) return bytes + " B";
- int exp = (int) (Math.log(bytes) / Math.log(unit));
- String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp-1) + (si ? "" : "i");
- return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
- }
+
private void processNeedCommand(String argument) {
int p1 =argument.indexOf('\'');
|