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
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 @@
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 @@
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
