diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 12:11:27 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 14:26:28 -0600 |
| commit | aaef532599ebfac1f3e8f244a0cd2118ced30327 (patch) | |
| tree | 8f27bed1c92b5ce73ec0fe9a97d3b0f4d45275d4 | |
| parent | bdedc7fa03c962f79d1f2ecdb8720ac29394a02e (diff) | |
| parent | 7d8e1bded64fc6186eb2179ed566f5347e2f5f4e (diff) | |
Merge branch 'feature/retry-login' into develop
| -rw-r--r-- | src/se/leap/leapclient/Dashboard.java | 5 | ||||
| -rw-r--r-- | src/se/leap/openvpn/AboutFragment.java | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java index 93963b3b..f63649dd 100644 --- a/src/se/leap/leapclient/Dashboard.java +++ b/src/se/leap/leapclient/Dashboard.java @@ -68,8 +68,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf setContentView(R.layout.client_dashboard); ConfigHelper.setSharedPreferences(getSharedPreferences(ConfigHelper.PREFERENCES_KEY, MODE_PRIVATE)); - if(ConfigHelper.shared_preferences == null) - ConfigHelper.setSharedPreferences(preferences); + preferences = ConfigHelper.shared_preferences; if (ConfigHelper.getStringFromSharedPref(ConfigHelper.PROVIDER_KEY).isEmpty()) startActivityForResult(new Intent(this,ConfigurationWizard.class),CONFIGURE_LEAP); @@ -374,7 +373,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf Cookie session_id = new BasicClientCookie(session_id_cookie_key, session_id_string); downloadAuthedUserCertificate(session_id); } else if(resultCode == ConfigHelper.SRP_AUTHENTICATION_FAILED) { - setResult(RESULT_CANCELED); + logInDialog(getCurrentFocus()); Toast.makeText(getApplicationContext(), R.string.authentication_failed_message, Toast.LENGTH_LONG).show(); } else if(resultCode == ConfigHelper.LOGOUT_SUCCESSFUL) { setResult(RESULT_OK); diff --git a/src/se/leap/openvpn/AboutFragment.java b/src/se/leap/openvpn/AboutFragment.java index 4f9f9f2e..235216ec 100644 --- a/src/se/leap/openvpn/AboutFragment.java +++ b/src/se/leap/openvpn/AboutFragment.java @@ -16,8 +16,8 @@ import se.leap.leapclient.R; public class AboutFragment extends Fragment { public static Fragment newInstance() { - AboutFragment instance = new AboutFragment(); - return instance; + AboutFragment provider_detail_fragment = new AboutFragment(); + return provider_detail_fragment; } @Override |