summaryrefslogtreecommitdiff
path: root/src/de/blinkt/openvpn
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-02-21 16:27:46 +0100
committerArne Schwabe <arne@rfc2549.org>2013-02-21 16:27:46 +0100
commit409df8373d9a06553d1d297428b272260db8aed4 (patch)
treecec6ff836329062683bcfbc558b2b19ab676f424 /src/de/blinkt/openvpn
parent1765c3016dfdd73ad382d3e4600d6b30a20653d5 (diff)
fix manifest, remember timestamp format, introduce overly accurate timestamp format (=ISO)
Diffstat (limited to 'src/de/blinkt/openvpn')
-rw-r--r--src/de/blinkt/openvpn/LogWindow.java19
-rw-r--r--src/de/blinkt/openvpn/OpenVPNThread.java2
2 files changed, 17 insertions, 4 deletions
diff --git a/src/de/blinkt/openvpn/LogWindow.java b/src/de/blinkt/openvpn/LogWindow.java
index 4e153357..c7bbe6ac 100644
--- a/src/de/blinkt/openvpn/LogWindow.java
+++ b/src/de/blinkt/openvpn/LogWindow.java
@@ -1,6 +1,8 @@
package de.blinkt.openvpn;
+import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Locale;
import java.util.Vector;
import android.app.AlertDialog;
@@ -38,6 +40,7 @@ import de.blinkt.openvpn.OpenVPN.StateListener;
import de.blinkt.openvpn.OpenVpnService.LocalBinder;
public class LogWindow extends ListActivity implements StateListener {
+ private static final String LOGTIMEFORMAT = "logtimeformat";
private static final int START_VPN_CONFIG = 0;
private String[] mBconfig=null;
protected OpenVpnService mService;
@@ -156,9 +159,14 @@ public class LogWindow extends ListActivity implements StateListener {
LogItem le = myEntries.get(position);
String msg = le.getString(LogWindow.this);
- if (mTimeFormat%2 == 1) {
+ if (mTimeFormat != 0) {
Date d = new Date(le.getLogtime());
- String time = DateFormat.getTimeFormat(LogWindow.this).format(d);
+ java.text.DateFormat timeformat;
+ if (mTimeFormat==2)
+ timeformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss",Locale.getDefault());
+ else
+ timeformat = DateFormat.getTimeFormat(LogWindow.this);
+ String time = timeformat.format(d);
msg = time + " " + msg;
}
v.setText(msg);
@@ -237,9 +245,10 @@ public class LogWindow extends ListActivity implements StateListener {
public void nextTimeFormat() {
- mTimeFormat+=1;
+ mTimeFormat= (mTimeFormat+ 1) % 3;
mHandler.sendEmptyMessage(MESSAGE_NEWTS);
}
+
}
@@ -355,6 +364,8 @@ public class LogWindow extends ListActivity implements StateListener {
protected void onStop() {
super.onStop();
OpenVPN.removeStateListener(this);
+ getPreferences(0).edit().putInt(LOGTIMEFORMAT, ladapter.mTimeFormat).apply();
+
}
@Override
@@ -379,6 +390,7 @@ public class LogWindow extends ListActivity implements StateListener {
});
ladapter = new LogWindowListAdapter();
+ ladapter.mTimeFormat = getPreferences(0).getInt(LOGTIMEFORMAT, 0);
lv.setAdapter(ladapter);
mSpeedView = (TextView) findViewById(R.id.speed);
@@ -408,6 +420,7 @@ public class LogWindow extends ListActivity implements StateListener {
}
+
@Override
protected void onDestroy() {
unbindService(mConnection);
diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java
index 2bdffe95..cbaab234 100644
--- a/src/de/blinkt/openvpn/OpenVPNThread.java
+++ b/src/de/blinkt/openvpn/OpenVPNThread.java
@@ -64,7 +64,7 @@ public class OpenVPNThread implements Runnable {
SimpleDateFormat timeformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss",Locale.GERMAN);
for(LogItem li :OpenVPN.getlogbuffer()){
String time = timeformat.format(new Date(li.getLogtime()));
- logout.write(time +" " + li.getString(null) + "\n");
+ logout.write(time +" " + li.getString(mService) + "\n");
}
logout.close();
OpenVPN.logError(R.string.minidump_generated);