diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-11-30 00:56:28 +0100 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-11-30 00:56:28 +0100 |
| commit | 8462f8a65eacbc47d8e63db058584bed0898e279 (patch) | |
| tree | 7df2795d04ac8550d1e6907d5efa4c75c5fb07d3 /src | |
| parent | ecd01db4ca5c0000d671e888ebdf97c3fdbd51cc (diff) | |
| parent | 6bf1c8ccbf83defb44e279ed4236e9538c3a09ba (diff) | |
Merge branch 'feature/tests-0.2.1' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/se/leap/bitmaskclient/ConfigHelper.java | 3 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/LogInDialog.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/se/leap/bitmaskclient/ConfigHelper.java b/src/se/leap/bitmaskclient/ConfigHelper.java index a29ff301..dd7049a7 100644 --- a/src/se/leap/bitmaskclient/ConfigHelper.java +++ b/src/se/leap/bitmaskclient/ConfigHelper.java @@ -58,7 +58,8 @@ public class ConfigHelper { private static boolean checkSharedPrefs() { try { - shared_preferences = Dashboard.getAppContext().getSharedPreferences(Dashboard.SHARED_PREFERENCES,Context.MODE_PRIVATE); + if(shared_preferences == null) + shared_preferences = Dashboard.getAppContext().getSharedPreferences(Dashboard.SHARED_PREFERENCES,Context.MODE_PRIVATE); } catch (Exception e) { return false; } diff --git a/src/se/leap/bitmaskclient/LogInDialog.java b/src/se/leap/bitmaskclient/LogInDialog.java index 3651e9ba..81a3f764 100644 --- a/src/se/leap/bitmaskclient/LogInDialog.java +++ b/src/se/leap/bitmaskclient/LogInDialog.java @@ -86,8 +86,8 @@ public class LogInDialog extends DialogFragment { builder.setView(log_in_dialog_view) .setPositiveButton(R.string.login_button, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - String username = username_field.getText().toString().trim(); - String password = password_field.getText().toString().trim(); + String username = username_field.getText().toString(); + String password = password_field.getText().toString(); dialog.dismiss(); interface_with_Dashboard.authenticate(username, password); } |