Correct network state message

Improve logging framework a bit
Add logging of certificates received from Keystore

1 files changed, 5 insertions, 4 deletions

diff --git a/src/de/blinkt/openvpn/LogWindow.java b/src/de/blinkt/openvpn/LogWindow.java
index b38951df..6060e7ad 100644
--- a/src/de/blinkt/openvpn/LogWindow.java
+++ b/src/de/blinkt/openvpn/LogWindow.java
@@ -27,6 +27,7 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
+import de.blinkt.openvpn.OpenVPN.LogItem;
 import de.blinkt.openvpn.OpenVPN.LogListener;
 import de.blinkt.openvpn.OpenVPN.StateListener;
 
@@ -59,8 +60,8 @@ public class LogWindow extends ListActivity implements StateListener  {
 
 		private void initLogBuffer() {
 			myEntries.clear();
-			for (String litem : OpenVPN.getlogbuffer()) {
-				myEntries.add(litem);				
+			for (LogItem litem : OpenVPN.getlogbuffer()) {
+				myEntries.add(litem.getString(getBaseContext()));				
 			}
 		}
 
@@ -149,11 +150,11 @@ public class LogWindow extends ListActivity implements StateListener  {
 		}
 
 		@Override
-		public void newLog(String logmessage) {
+		public void newLog(LogItem logmessage) {
 			Message msg = Message.obtain();
 			msg.what=MESSAGE_NEWLOG;
 			Bundle mbundle=new Bundle();
-			mbundle.putString("logmessage", logmessage);
+			mbundle.putString("logmessage", logmessage.getString(getBaseContext()));
 			msg.setData(mbundle);
 			mHandler.sendMessage(msg);
 		}