diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-06-29 16:01:14 +0200 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 11:54:52 -0600 |
| commit | 6776f5eb7b384982ffab3cfd285c3180ecb14bc8 (patch) | |
| tree | 18b3132ecc94acc56695e140b2b2c6dff59353bd /src/se/leap/leapclient | |
| parent | b684f2fdd35064210d7c5ae760c1a2e4939b1ec5 (diff) | |
Back button from ConfigurationWizard quits.
If the user decides not to choose any provider, the app quits. I'll
create another branch to handle this exit properly, warning the user
with an AlertDialog as suggested in #3023.
Diffstat (limited to 'src/se/leap/leapclient')
| -rw-r--r-- | src/se/leap/leapclient/ConfigHelper.java | 3 | ||||
| -rw-r--r-- | src/se/leap/leapclient/ConfigurationWizard.java | 8 | ||||
| -rw-r--r-- | src/se/leap/leapclient/Dashboard.java | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/se/leap/leapclient/ConfigHelper.java b/src/se/leap/leapclient/ConfigHelper.java index 559c8e03..acc4888a 100644 --- a/src/se/leap/leapclient/ConfigHelper.java +++ b/src/se/leap/leapclient/ConfigHelper.java @@ -80,7 +80,8 @@ public class ConfigHelper { PROVIDER_DETAILS_DIALOG = "providerDetailsFragment", DOMAIN = "domain", NAME = "name", - DESCRIPTION = "description" + DESCRIPTION = "description", + QUIT = "quit" ; final public static String NG_1024 = diff --git a/src/se/leap/leapclient/ConfigurationWizard.java b/src/se/leap/leapclient/ConfigurationWizard.java index cd367bc4..a9fac096 100644 --- a/src/se/leap/leapclient/ConfigurationWizard.java +++ b/src/se/leap/leapclient/ConfigurationWizard.java @@ -148,6 +148,14 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn mSelectedProvider = selected_provider;
saveProviderJson(mSelectedProvider);
}
+
+ @Override
+ public void onBackPressed() {
+ Intent ask_quit = new Intent();
+ ask_quit.putExtra(ConfigHelper.QUIT, ConfigHelper.QUIT);
+ setResult(RESULT_CANCELED, ask_quit);
+ super.onBackPressed();
+ }
private ProviderItem getProvider(String id) {
Iterator<ProviderItem> providers_iterator = ProviderListContent.ITEMS.iterator();
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java index 1e7fbf68..93963b3b 100644 --- a/src/se/leap/leapclient/Dashboard.java +++ b/src/se/leap/leapclient/Dashboard.java @@ -103,6 +103,8 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0); logInDialog(view); } + } else if(resultCode == RESULT_CANCELED && data.hasExtra(ConfigHelper.QUIT)) { + finish(); } else configErrorDialog(); } |