diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-11-20 16:06:39 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-11-21 18:57:41 +0100 |
| commit | 73d0fb0a66c54ec74fa2608ebb0a51096bb0df03 (patch) | |
| tree | 4ffae51a89d638e7e84af1a07641e9cb64d7de96 /src | |
| parent | 8c0b32d892e45b5317d3ebd90ee3e7e39824ca9d (diff) | |
| download | strongswan-73d0fb0a66c54ec74fa2608ebb0a51096bb0df03.tar.bz2 strongswan-73d0fb0a66c54ec74fa2608ebb0a51096bb0df03.tar.xz | |
android: Use the same tag string for all dialogs in MainActivity
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontends/android/src/org/strongswan/android/ui/MainActivity.java | 11 |
1 files changed, 5 insertions, 6 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 50f83b2b4..d7c1cc4ef 100644 --- a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java +++ b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java @@ -62,6 +62,7 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen private static final String PROFILE_NAME = "org.strongswan.android.MainActivity.PROFILE_NAME"; private static final String PROFILE_REQUIRES_PASSWORD = "org.strongswan.android.MainActivity.REQUIRES_PASSWORD"; private static final String PROFILE_RECONNECT = "org.strongswan.android.MainActivity.RECONNECT"; + private static final String DIALOG_TAG = "Dialog"; private Bundle mProfileInfo; private VpnStateService mService; @@ -218,9 +219,7 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen profileInfo.putBoolean(PROFILE_REQUIRES_PASSWORD, profile.getVpnType().getRequiresUsernamePassword()); profileInfo.putString(PROFILE_NAME, profile.getName()); - removeFragmentByTag("ConfirmationDialog"); - removeFragmentByTag("LoginDialog"); - removeFragmentByTag("ErrorDialog"); + removeFragmentByTag(DIALOG_TAG); if (mService != null && mService.getState() == State.CONNECTED) { @@ -228,7 +227,7 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen ConfirmationDialog dialog = new ConfirmationDialog(); dialog.setArguments(profileInfo); - dialog.show(this.getFragmentManager(), "ConfirmationDialog"); + dialog.show(this.getFragmentManager(), DIALOG_TAG); return; } startVpnProfile(profileInfo); @@ -245,7 +244,7 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen { LoginDialog login = new LoginDialog(); login.setArguments(profileInfo); - login.show(getFragmentManager(), "LoginDialog"); + login.show(getFragmentManager(), DIALOG_TAG); return; } prepareVpnService(profileInfo); @@ -417,7 +416,7 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen bundle.putInt(ERROR_MESSAGE_ID, messageId); VpnNotSupportedError dialog = new VpnNotSupportedError(); dialog.setArguments(bundle); - dialog.show(activity.getFragmentManager(), "ErrorDialog"); + dialog.show(activity.getFragmentManager(), DIALOG_TAG); } @Override |