summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOluwatobi Bashir-Bello <nbashirbello@google.com>2014-08-08 17:55:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-07 18:51:06 +0000
commite6deec45479492a9b6cf7dd79ed93b8c880df464 (patch)
treed0e6c097b0d33ae4d7708a3e5866206f73b8694c
parentfd77989c58969cb1352c27a8d37ac83ad4280b15 (diff)
parentb75bcce27b0af8bdaacfb6b9afd1583bb05bc567 (diff)
downloadcloud-e6deec45479492a9b6cf7dd79ed93b8c880df464.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
-rw-r--r--login/src/com/google/gct/login/GoogleLogin.java10
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