diff options
author | arne <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
---|---|---|
committer | arne <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
commit | c9dc454f4ec38f075f951fbf32935054023eed94 (patch) | |
tree | 33d36c8bfb68db406e3ae90237b145077efecda5 /src/de/blinkt/openvpn/LogWindow.java | |
parent | e57c7dd4a792d02897140d0c5e2d014bcd1147c0 (diff) | |
parent | b2b8b3da3f501543338fc5065519ab778379c274 (diff) |
Merge local changes with repository
Diffstat (limited to 'src/de/blinkt/openvpn/LogWindow.java')
-rw-r--r-- | src/de/blinkt/openvpn/LogWindow.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/de/blinkt/openvpn/LogWindow.java b/src/de/blinkt/openvpn/LogWindow.java index 8d228cf1..790e143a 100644 --- a/src/de/blinkt/openvpn/LogWindow.java +++ b/src/de/blinkt/openvpn/LogWindow.java @@ -76,6 +76,7 @@ public class LogWindow extends ListActivity implements StateListener { return str; } + private void shareLog() { Intent shareIntent = new Intent(Intent.ACTION_SEND); shareIntent.putExtra(Intent.EXTRA_TEXT, getLogStr()); @@ -215,12 +216,13 @@ public class LogWindow extends ListActivity implements StateListener { OpenVpnManagementThread.stopOpenVPN(); } }); - + builder.show(); return true; } else if(item.getItemId()==R.id.info) { if(mBconfig==null) OpenVPN.triggerLogBuilderConfig(); + } else if(item.getItemId()==R.id.send) { ladapter.shareLog(); } else if(item.getItemId()==R.id.edit_vpn) { @@ -252,6 +254,7 @@ public class LogWindow extends ListActivity implements StateListener { return true; } + @Override protected void onResume() { super.onResume(); |