diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
commit | 9108878992e9825a00c44f0596818d0ab245b183 (patch) | |
tree | 088b116ca4b1236827337a3d5ae204abc0f907bb /app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java | |
parent | 6c1434addf1ee25a8c7ce30c240e2033d5075f35 (diff) | |
parent | 0365f243fc56112b2f43b35e1b4884d2d1ad2aa4 (diff) |
Merge branch 'leap_0.9.8' into #8797_certificate_expiration
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java b/app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java index 3d85b4ad..03e0669a 100644 --- a/app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java @@ -63,7 +63,6 @@ import de.blinkt.openvpn.core.ProfileManager; import de.blinkt.openvpn.core.VpnStatus; import de.blinkt.openvpn.core.VpnStatus.LogListener; import de.blinkt.openvpn.core.VpnStatus.StateListener; -import se.leap.bitmaskclient.Dashboard; import se.leap.bitmaskclient.R; import static de.blinkt.openvpn.core.OpenVPNService.humanReadableByteCount; @@ -427,29 +426,8 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. return true; } else if (item.getItemId() == R.id.send) { ladapter.shareLog(); - } else if (item.getItemId() == R.id.edit_vpn) { - VpnProfile lastConnectedprofile = ProfileManager.get(getActivity(), VpnStatus.getLastConnectedVPNProfile()); - - if (lastConnectedprofile != null) { - Intent vprefintent = new Intent(getActivity(), Dashboard.class) - .putExtra(VpnProfile.EXTRA_PROFILEUUID, lastConnectedprofile.getUUIDString()); - startActivityForResult(vprefintent, START_VPN_CONFIG); - } else { - Toast.makeText(getActivity(), R.string.log_no_last_vpn, Toast.LENGTH_LONG).show(); - } } else if (item.getItemId() == R.id.toggle_time) { showHideOptionsPanel(); - } else if (item.getItemId() == android.R.id.home) { - // This is called when the Home (Up) button is pressed - // in the Action Bar. - Intent parentActivityIntent = new Intent(getActivity(), Dashboard.class); - parentActivityIntent.addFlags( - Intent.FLAG_ACTIVITY_CLEAR_TOP | - Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(parentActivityIntent); - getActivity().finish(); - return true; - } return super.onOptionsItemSelected(item); |