From 7ad69e645000fc66951a79104b0ce5ac3478b9f3 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 18 May 2012 00:06:49 +0200
Subject: - Make Ipv6 support complete (minus tun-ipv6 warning) - Implement
 byte counter support in the log window - Fix spelling of secret (closes issue
 #22) - Replace &quot;quot; with &quot;, no idea what went wrong there (closes
 issue #21)

---
 src/de/blinkt/openvpn/LogWindow.java | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

(limited to 'src/de/blinkt/openvpn/LogWindow.java')

diff --git a/src/de/blinkt/openvpn/LogWindow.java b/src/de/blinkt/openvpn/LogWindow.java
index 3455e385..2e2612d3 100644
--- a/src/de/blinkt/openvpn/LogWindow.java
+++ b/src/de/blinkt/openvpn/LogWindow.java
@@ -28,8 +28,9 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 import de.blinkt.openvpn.OpenVPN.LogListener;
+import de.blinkt.openvpn.OpenVPN.SpeedListener;
 
-public class LogWindow extends ListActivity  {
+public class LogWindow extends ListActivity implements SpeedListener  {
 	private String[] mBconfig=null;
 
 
@@ -190,6 +191,7 @@ public class LogWindow extends ListActivity  {
 
 
 	private LogWindowListAdapter ladapter;
+	private TextView mSpeedView;
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
@@ -228,12 +230,23 @@ public class LogWindow extends ListActivity  {
 		return true;
 	}
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+		OpenVPN.addSpeedListener(this);
+	}
 
+	@Override
+	protected void onStop() {
+		super.onStop();
+		OpenVPN.removeSpeedListener(this);
+	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
+		setContentView(R.layout.logwindow);
 		ListView lv = getListView();
 		
 		lv.setOnItemLongClickListener(new OnItemLongClickListener() {
@@ -249,12 +262,29 @@ public class LogWindow extends ListActivity  {
 				return true;
 			}
 		});
-		//lv.setTextFilterEnabled(true);
+
 		ladapter = new LogWindowListAdapter();
 		lv.setAdapter(ladapter);
 
+		mSpeedView = (TextView) findViewById(R.id.speed);
 	}
 
-
+	@Override
+	public void updateSpeed(final String logmessage) {
+		runOnUiThread(new Runnable() {
+			
+			@Override
+			public void run() {
+				mSpeedView.setText(logmessage);
+			}
+		});
+		
+	}
+	
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		OpenVPN.removeLogListener(ladapter);
+	}
 
 }
-- 
cgit v1.2.3