diff options
| author | Oluwatobi Bashir-Bello <nbashirbello@google.com> | 2014-08-08 17:56:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-08-08 17:56:22 +0000 |
| commit | eb8613d07b85a185fe5cbbbeb444ea923151eca9 (patch) | |
| tree | d0e6c097b0d33ae4d7708a3e5866206f73b8694c | |
| parent | fbd2db5a940b0da1e2f5f1fb4cf61653deda8157 (diff) | |
| parent | e6deec45479492a9b6cf7dd79ed93b8c880df464 (diff) | |
| download | cloud-eb8613d07b85a185fe5cbbbeb444ea923151eca9.tar.gz | |
Merge "The Google Login sign out confirmation dialog message should be changed to “Are you sure you want to sign out London Westminster (london@gmail.com)?”" into idea133
automerge: e6deec4
* commit 'e6deec45479492a9b6cf7dd79ed93b8c880df464':
The Google Login sign out confirmation dialog message should be changed to “Are you sure you want to sign out London Westminster (london@gmail.com)?”
| -rw-r--r-- | login/src/com/google/gct/login/GoogleLogin.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/login/src/com/google/gct/login/GoogleLogin.java b/login/src/com/google/gct/login/GoogleLogin.java index 8cf05c3..850eda4 100644 --- a/login/src/com/google/gct/login/GoogleLogin.java +++ b/login/src/com/google/gct/login/GoogleLogin.java @@ -617,8 +617,16 @@ public class GoogleLogin { @Override public boolean askYesOrNo(String title, String message) { + String updatedMessage = message; + if(message.equals("Are you sure you want to sign out?")) { + CredentialedUser activeUser = getActiveUser(); + String name = activeUser.getName().isEmpty() ? "" : activeUser.getName() + " "; + updatedMessage = "Are you sure you want to sign out " + name + + "(" + activeUser.getEmail() + ")?"; + } + Icon icon = IconLoader.getIcon(GOOGLE_IMG); - return (Messages.showYesNoDialog(message, title, icon) == Messages.YES); + return (Messages.showYesNoDialog(updatedMessage, title, icon) == Messages.YES); } @Override |