summaryrefslogtreecommitdiff
path: root/src/de/blinkt/openvpn/OpenVPNClient.java
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-04-23 00:07:02 +0200
committerArne Schwabe <arne@rfc2549.org>2012-04-23 00:07:02 +0200
commit58e2574f6a27930679f976278ad9c3dbc8d4ef2a (patch)
treeed66e30a6d1acf1fcb68672cb636507e0bd89d2a /src/de/blinkt/openvpn/OpenVPNClient.java
parent488a41cc60636298581c2b44b4706b259fc98a36 (diff)
Doing progress on the Preference dialog chaos
Diffstat (limited to 'src/de/blinkt/openvpn/OpenVPNClient.java')
-rw-r--r--src/de/blinkt/openvpn/OpenVPNClient.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/de/blinkt/openvpn/OpenVPNClient.java b/src/de/blinkt/openvpn/OpenVPNClient.java
index f1a32b63..5af0ae8f 100644
--- a/src/de/blinkt/openvpn/OpenVPNClient.java
+++ b/src/de/blinkt/openvpn/OpenVPNClient.java
@@ -250,7 +250,7 @@ public class OpenVPNClient extends Activity implements View.OnClickListener, OnI
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.config);
+ setContentView(R.layout.basic_settings);
// Forces early JNI Load
OpenVPN.foo();
@@ -490,6 +490,7 @@ public class OpenVPNClient extends Activity implements View.OnClickListener, OnI
} else if (v == findViewById(R.id.about)) {
//Intent intent = new Intent(getBaseContext(),AboutActivity.class);
Intent intent = new Intent(getBaseContext(),VPNPreferences.class);
+ intent.putExtra("foo","der bar war hier!");
startActivity(intent);
} else if (v == findViewById(R.id.select_keystore_button)) {
showCertDialog();