diff options
| author | Oluwatobi Bashir-Bello <nbashirbello@google.com> | 2014-08-11 21:44:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-08-11 21:44:10 +0000 |
| commit | a73459f66bf7fdf75aecd571439aea55de8f6565 (patch) | |
| tree | 6cd22694e50cd4b186e488be55ca04d8453c5f6f | |
| parent | a99b92cfb48ff43b0d94fc6ebb759a156da4bbb3 (diff) | |
| parent | 7e3d46f3b677817867642ef650aadfa2f3d8a6fb (diff) | |
| download | cloud-a73459f66bf7fdf75aecd571439aea55de8f6565.tar.gz | |
Merge "Changed the message on the Google login sign-in progress bar and changed the flow of the login such that when the verification code is retrieved, the developers.google.com webpage is opened (this is a temporary landing page)." into idea133
automerge: 7e3d46f
* commit '7e3d46f3b677817867642ef650aadfa2f3d8a6fb':
Changed the message on the Google login sign-in progress bar and changed the flow of the login such that when the verification code is retrieved, the developers.google.com webpage is opened (this is a temporary landing page).
| -rw-r--r-- | login/src/com/google/gct/login/CancellableServerReceiver.java | 5 | ||||
| -rw-r--r-- | login/src/com/google/gct/login/GoogleLogin.java | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/login/src/com/google/gct/login/CancellableServerReceiver.java b/login/src/com/google/gct/login/CancellableServerReceiver.java index da794fe..dfe1cd8 100644 --- a/login/src/com/google/gct/login/CancellableServerReceiver.java +++ b/login/src/com/google/gct/login/CancellableServerReceiver.java @@ -233,15 +233,14 @@ class CancellableServerReceiver implements VerificationCodeReceiver { PrintWriter doc = response.getWriter(); doc.println("<html>"); - doc.println("<head><title>OAuth 2.0 Authentication Token Recieved</title></head>"); + doc.println("<head><title>OAuth 2.0 Authentication Token Received</title></head>"); doc.println("<body>"); doc.println("Received verification code. Closing..."); doc.println("<script type='text/javascript'>"); // We open "" in the same window to trigger JS ownership of it, which lets // us then close it via JS, at least in Chrome. doc.println("window.setTimeout(function() {"); - doc.println(" window.open('', '_self', ''); window.close(); }, 1000);"); - doc.println("if (window.opener) { window.opener.checkToken(); }"); + doc.println(" window.open('https://developers.google.com/', '_self', '');}, 100);"); doc.println("</script>"); doc.println("</body>"); doc.println("</HTML>"); diff --git a/login/src/com/google/gct/login/GoogleLogin.java b/login/src/com/google/gct/login/GoogleLogin.java index 850eda4..50d6c67 100644 --- a/login/src/com/google/gct/login/GoogleLogin.java +++ b/login/src/com/google/gct/login/GoogleLogin.java @@ -310,7 +310,7 @@ public class GoogleLogin { final GoogleLoginState state = createGoogleLoginState(); - new Task.Modal(null, "Please Log in...", true) { + new Task.Modal(null, "Please sign in via the opened browser...", true) { private boolean loggedIn = false; @Override |