From 1787d6dcbb0cc54e78043e6093ac45b09f0986a7 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 13 May 2012 02:03:20 +0200 Subject: Version 0.5.3 Fix a few new bugs before pushing to the market :) --- src/de/blinkt/openvpn/ConfigConverter.java | 2 -- src/de/blinkt/openvpn/ConfigParser.java | 3 ++- src/de/blinkt/openvpn/FileSelect.java | 5 +++-- src/de/blinkt/openvpn/VpnProfile.java | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'src/de/blinkt/openvpn') diff --git a/src/de/blinkt/openvpn/ConfigConverter.java b/src/de/blinkt/openvpn/ConfigConverter.java index 686a4e42..50d08b73 100644 --- a/src/de/blinkt/openvpn/ConfigConverter.java +++ b/src/de/blinkt/openvpn/ConfigConverter.java @@ -15,7 +15,6 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.widget.ArrayAdapter; -import android.widget.Toast; import de.blinkt.openvpn.ConfigParser.ConfigParseError; public class ConfigConverter extends ListActivity { @@ -29,7 +28,6 @@ public class ConfigConverter extends ListActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Toast.makeText(this, "Got called!", Toast.LENGTH_LONG).show(); } diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java index a64fb403..1b37c0a8 100644 --- a/src/de/blinkt/openvpn/ConfigParser.java +++ b/src/de/blinkt/openvpn/ConfigParser.java @@ -219,7 +219,8 @@ public class ConfigParser { "route-gateway", "topology", "persist-tun", - "route-metric" + "route-metric", + "suppress-timestamps" }; diff --git a/src/de/blinkt/openvpn/FileSelect.java b/src/de/blinkt/openvpn/FileSelect.java index cc8f55f4..62cd9883 100644 --- a/src/de/blinkt/openvpn/FileSelect.java +++ b/src/de/blinkt/openvpn/FileSelect.java @@ -53,7 +53,6 @@ public class FileSelect extends Activity { inlineFileTab = bar.newTab().setText(R.string.inline_file_tab); mFSFragment = new FileSelectionFragment(); - mFSFragment.setNoInLine(); fileExplorerTab.setTabListener(new MyTabsListener(this, mFSFragment)); bar.addTab(fileExplorerTab); @@ -61,7 +60,9 @@ public class FileSelect extends Activity { mInlineFragment = new InlineFileTab(); inlineFileTab.setTabListener(new MyTabsListener(this, mInlineFragment)); bar.addTab(inlineFileTab); - } + } else { + mFSFragment.setNoInLine(); + } } diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java index aed9ca03..b5e421fb 100644 --- a/src/de/blinkt/openvpn/VpnProfile.java +++ b/src/de/blinkt/openvpn/VpnProfile.java @@ -148,7 +148,10 @@ public class VpnProfile implements Serializable{ cfg+="tmp-dir "; cfg+=cacheDir.getAbsolutePath(); cfg+="\n\n"; - + + cfg+="# Log window is better readable this way\n"; + cfg+="suppress-timestamps\n"; + boolean useTLSClient = (mAuthenticationType != TYPE_STATICKEYS); -- cgit v1.2.3