diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-11-15 18:51:24 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-11-19 11:43:32 +0100 |
| commit | be2e7ecc2ff3166b643a1cdbd87b1cf3aae0cfff (patch) | |
| tree | ecffae7b9059bfe6f16ca994f964aee3455ffd39 /src | |
| parent | 0c3b8028e775ca2791a4044162df84d340497215 (diff) | |
| download | strongswan-be2e7ecc2ff3166b643a1cdbd87b1cf3aae0cfff.tar.bz2 strongswan-be2e7ecc2ff3166b643a1cdbd87b1cf3aae0cfff.tar.xz | |
android: Add error message as argument to "VPN not supported" dialog
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontends/android/src/org/strongswan/android/ui/MainActivity.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java index 6ebfdcafc..77ab56306 100644 --- a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java +++ b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java @@ -110,7 +110,7 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen * don't have the VPN components built into the system image. * com.android.vpndialogs/com.android.vpndialogs.ConfirmDialog * will not be found then */ - new VpnNotSupportedError().show(getFragmentManager(), "ErrorDialog"); + VpnNotSupportedError.showWithMessage(this, R.string.vpn_not_supported); } } else @@ -228,12 +228,25 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen */ public static class VpnNotSupportedError extends DialogFragment { + static final String ERROR_MESSAGE_ID = "org.strongswan.android.VpnNotSupportedError.MessageId"; + + public static void showWithMessage(Activity activity, int messageId) + { + Bundle bundle = new Bundle(); + bundle.putInt(ERROR_MESSAGE_ID, messageId); + VpnNotSupportedError dialog = new VpnNotSupportedError(); + dialog.setArguments(bundle); + dialog.show(activity.getFragmentManager(), "ErrorDialog"); + } + @Override public Dialog onCreateDialog(Bundle savedInstanceState) { + final Bundle arguments = getArguments(); + final int messageId = arguments.getInt(ERROR_MESSAGE_ID); return new AlertDialog.Builder(getActivity()) .setTitle(R.string.vpn_not_supported_title) - .setMessage(getString(R.string.vpn_not_supported)) + .setMessage(messageId) .setCancelable(false) .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override |