diff options
author | Chia-chi Yeh <chiachi@android.com> | 2012-02-29 16:12:35 -0800 |
---|---|---|
committer | Chia-chi Yeh <chiachi@android.com> | 2012-02-29 16:12:35 -0800 |
commit | 94cc1bbf3218a020548a90032ec34f608f4cefdb (patch) | |
tree | 91966035dde105c1f9bc7bad02f510bd975d22c0 /src/com/android/settings/vpn2 | |
parent | 44a520a9b1a6c7e5b0b66d2416bdb9a44f113026 (diff) | |
download | packages_apps_Settings-94cc1bbf3218a020548a90032ec34f608f4cefdb.zip packages_apps_Settings-94cc1bbf3218a020548a90032ec34f608f4cefdb.tar.gz packages_apps_Settings-94cc1bbf3218a020548a90032ec34f608f4cefdb.tar.bz2 |
VpnSettings: show more error messages when VPN fails.
Bug: 6032883
Change-Id: Idc49e1b611fd0c01f199bfde984084a8e4c62e17
Diffstat (limited to 'src/com/android/settings/vpn2')
-rw-r--r-- | src/com/android/settings/vpn2/VpnSettings.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 655306a..975f807 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -38,6 +38,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.Toast; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; @@ -324,10 +325,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements private String[] getDefaultNetwork() throws Exception { LinkProperties network = mService.getActiveLinkProperties(); if (network == null) { + Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show(); throw new IllegalStateException("Network is not available"); } String interfaze = network.getInterfaceName(); if (interfaze == null) { + Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show(); throw new IllegalStateException("Cannot get the default interface"); } String gateway = null; @@ -339,6 +342,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements } } if (gateway == null) { + Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show(); throw new IllegalStateException("Cannot get the default gateway"); } return new String[] {interfaze, gateway}; @@ -370,7 +374,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements serverCert = (value == null) ? null : new String(value, Charsets.UTF_8); } if (privateKey == null || userCert == null || caCert == null || serverCert == null) { - // TODO: find out a proper way to handle this. Delete these keys? + Toast.makeText(getActivity(), R.string.vpn_missing_cert, Toast.LENGTH_LONG).show(); throw new IllegalStateException("Cannot load credentials"); } |