diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-10-03 16:41:53 +0200 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-11-15 23:25:17 +0100 |
| commit | 76d52773a237da8fcae3670a959bbe2bfe609796 (patch) | |
| tree | 9c55428d69537f98b4bdb7b7ff668fc0eb4c3a9b /src/se/leap/bitmaskclient/Dashboard.java | |
| parent | 180b4d31526e442dd4978ca321a304f26b32240c (diff) | |
Switching provider offers all providers from list.
This fixes bug #4004: With new progress bars branch, if user switches provider the list of providers is not complete.
Diffstat (limited to 'src/se/leap/bitmaskclient/Dashboard.java')
| -rw-r--r-- | src/se/leap/bitmaskclient/Dashboard.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java index 5a2417ff..68b7d248 100644 --- a/src/se/leap/bitmaskclient/Dashboard.java +++ b/src/se/leap/bitmaskclient/Dashboard.java @@ -61,10 +61,12 @@ import android.widget.Toast; public class Dashboard extends Activity implements LogInDialog.LogInDialogInterface,Receiver { protected static final int CONFIGURE_LEAP = 0; + protected static final int SWITCH_PROVIDER = 1; private static final String TAG_EIP_FRAGMENT = "EIP_DASHBOARD_FRAGMENT"; final public static String SHARED_PREFERENCES = "LEAPPreferences"; final public static String ACTION_QUIT = "quit"; + public static final String REQUEST_CODE = "request_code"; private ProgressBar mProgressBar; private TextView eipStatus; @@ -225,7 +227,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf startActivity(intent); return true; case R.id.switch_provider: - startActivityForResult(new Intent(this,ConfigurationWizard.class),CONFIGURE_LEAP); + startActivityForResult(new Intent(this,ConfigurationWizard.class), SWITCH_PROVIDER); return true; case R.id.login_button: View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0); @@ -403,6 +405,12 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf public static Context getAppContext() { return app; } + + @Override + public void startActivityForResult(Intent intent, int requestCode) { + intent.putExtra(Dashboard.REQUEST_CODE, requestCode); + super.startActivityForResult(intent, requestCode); + } public class ProviderAPIBroadcastReceiver_Update extends BroadcastReceiver { |