diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-08-05 17:25:19 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-08-05 17:25:19 +0200 |
| commit | 4894b0fa01632db206a597f20daeb5880935733c (patch) | |
| tree | ddd204116a6aefc3ef8e8ff89b21b6d78d81e143 | |
| parent | 9521dbc9e5e37e49618f013acae0ede3690d8c72 (diff) | |
| parent | 782ec7260bd90582abecdd719dee1caf762177a0 (diff) | |
Merge branch 'feature/Add-sign-up-button-to-provider-details-#5856' into develop
3 files changed, 3 insertions, 2 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderDetailFragment.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderDetailFragment.java index c067ce2b..3ca003a0 100644 --- a/app/src/debug/java/se/leap/bitmaskclient/ProviderDetailFragment.java +++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderDetailFragment.java @@ -50,7 +50,7 @@ public class ProviderDetailFragment extends DialogFragment { }
if(registration_allowed(provider_json)) {
- builder.setNegativeButton(R.string.login_button, new DialogInterface.OnClickListener() {
+ builder.setNegativeButton(R.string.signup_or_login_button, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
interface_with_configuration_wizard.login();
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cecb4ea1..8c815786 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,6 +41,7 @@ <string name="error_io_exception_user_message">Try again: I/O error</string> <string name="error_json_exception_user_message">Try again: Bad response from the server</string> <string name="error_no_such_algorithm_exception_user_message">Update the app</string> + <string name="signup_or_login_button">Sign Up/Log In</string> <string name="login_button">Log In</string> <string name="logout_button">Log Out</string> <string name="signup_button">Sign Up</string> diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java index 42cdd516..9252b8fa 100644 --- a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java +++ b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java @@ -50,7 +50,7 @@ public class ProviderDetailFragment extends DialogFragment { }
if(registration_allowed(provider_json)) {
- builder.setNegativeButton(R.string.login_button, new DialogInterface.OnClickListener() {
+ builder.setNegativeButton(R.string.signup_or_login_button, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
interface_with_configuration_wizard.login();
}
|