6 files changed, 14 insertions, 21 deletions

diff --git a/resources/icons/GoogleLoginIcons.java b/resources/icons/GoogleLoginIcons.java
index 715ef72..079429d 100644
--- a/resources/icons/GoogleLoginIcons.java
+++ b/resources/icons/GoogleLoginIcons.java
@@ -40,8 +40,9 @@ import javax.swing.*;
  * will be used in all themes and resolutions.
  */
 public final class GoogleLoginIcons {
-
   public static final Icon GOOGLE_LOGO = load("/icons/google_logo.png");
+  public static final Icon GOOGLE_FAVICON = load("/icons/googleFavicon.png");
+  public static final Icon DEFAULT_USER_AVATAR = load("/icons/loginAvatar.png");
 
   private static Icon load(String path) {
     return IconLoader.getIcon(path, GoogleLoginIcons.class);
diff --git a/resources/icons/googleColored.png b/resources/icons/googleColored.png
deleted file mode 100644
index c8ae624..0000000
--- a/resources/icons/googleColored.png
+++ /dev/null
diff --git a/resources/icons/googleWhite.png b/resources/icons/googleWhite.png
deleted file mode 100644
index b37179c..0000000
--- a/resources/icons/googleWhite.png
+++ /dev/null
diff --git a/src/com/google/gct/login/GoogleLogin.java b/src/com/google/gct/login/GoogleLogin.java
index 4706947..0e77b59 100644
--- a/src/com/google/gct/login/GoogleLogin.java
+++ b/src/com/google/gct/login/GoogleLogin.java
@@ -23,12 +23,7 @@ import com.google.api.client.http.HttpRequestFactory;
 import com.google.common.base.Strings;
 import com.google.gct.login.ui.GoogleLoginActionButton;
 import com.google.gct.login.ui.GoogleLoginCopyAndPasteDialog;
-import com.google.gdt.eclipse.login.common.GoogleLoginState;
-import com.google.gdt.eclipse.login.common.LoggerFacade;
-import com.google.gdt.eclipse.login.common.OAuthData;
-import com.google.gdt.eclipse.login.common.OAuthDataStore;
-import com.google.gdt.eclipse.login.common.UiFacade;
-import com.google.gdt.eclipse.login.common.VerificationCodeHolder;
+import com.google.gdt.eclipse.login.common.*;
 import com.intellij.ide.BrowserUtil;
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -41,15 +36,13 @@ import com.intellij.openapi.progress.util.ProgressIndicatorBase;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
-
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.ex.ProgressIndicatorEx;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
+import icons.GoogleLoginIcons;
 import net.jcip.annotations.Immutable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.Icon;
 import java.awt.*;
 import java.io.IOException;
 import java.util.LinkedHashMap;
@@ -566,7 +559,6 @@ public class GoogleLogin {
    */
   private class AndroidUiFacade implements UiFacade {
     private GoogleLoginActionButton myButton;
-    private final static String GOOGLE_IMG = "/icons/googleFavicon@2x.png";
     private volatile CancellableServerReceiver receiver = null;
 
     @Override
@@ -649,8 +641,7 @@ public class GoogleLogin {
         }
         updatedMessage += "?";
       }
-      Icon icon = IconLoader.getIcon(GOOGLE_IMG);
-      return (Messages.showYesNoDialog(updatedMessage, title, icon) == Messages.YES);
+      return (Messages.showYesNoDialog(updatedMessage, title, GoogleLoginIcons.GOOGLE_FAVICON) == Messages.YES);
     }
 
     @Override
@@ -736,7 +727,7 @@ public class GoogleLogin {
         try {
           users.setActiveUser(activeUserString);
         } catch (IllegalArgumentException ex) {
-          LOG.error("Error while initiating users", ex);
+          LOG.warn("Error while initiating users", ex);
           // Set no active user
           users.removeActiveUser();
         }
diff --git a/src/com/google/gct/login/GoogleLoginUtils.java b/src/com/google/gct/login/GoogleLoginUtils.java
index 27e1f5e..2373ae3 100644
--- a/src/com/google/gct/login/GoogleLoginUtils.java
+++ b/src/com/google/gct/login/GoogleLoginUtils.java
@@ -84,7 +84,11 @@ public class GoogleLoginUtils {
         try {
           userInfo = userInfoService.userinfo().get().execute();
         } catch (IOException e) {
-          LOG.error("Error retrieving user information.", e);
+          //The core IDE functionality still works, so this does
+          //not affect anything right now. The user will receive
+          //error messages when they attempt to do something that
+          //requires a logged in state.
+          LOG.warn("Error retrieving user information.", e);
         }
 
         if (userInfo != null && userInfo.getId() != null) {
diff --git a/src/com/google/gct/login/ui/GoogleLoginActionButton.java b/src/com/google/gct/login/ui/GoogleLoginActionButton.java
index 3457485..bbd4702 100644
--- a/src/com/google/gct/login/ui/GoogleLoginActionButton.java
+++ b/src/com/google/gct/login/ui/GoogleLoginActionButton.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.actionSystem.impl.ActionButton;
 import com.intellij.openapi.util.IconLoader;
+import icons.GoogleLoginIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.Icon;
@@ -32,15 +33,11 @@ import java.awt.Image;
  * The Google Login button that appears on the main toolbar.
  */
 public final class GoogleLoginActionButton extends ActionButton {
-  private Icon defaultIcon;
   private final static String SIGN_IN_MESSAGE = "Sign in to Google...";
-  private final static String DEFAULT_AVATAR = "/icons/loginAvatar.png";
 
   public GoogleLoginActionButton(AnAction action, Presentation presentation, String place, @NotNull Dimension minimumSize) {
     super(action, presentation, place, minimumSize);
-
     GoogleLogin.getInstance().setLoginMenuItemContribution(this);
-    defaultIcon = IconLoader.getIcon(DEFAULT_AVATAR);
     updateUi();
   }
 
@@ -53,13 +50,13 @@ public final class GoogleLoginActionButton extends ActionButton {
     if(activeUser == null) {
       setToolTipText(SIGN_IN_MESSAGE);
       myPresentation.setDescription(SIGN_IN_MESSAGE);
-      myPresentation.setIcon(defaultIcon);
+      myPresentation.setIcon(GoogleLoginIcons.DEFAULT_USER_AVATAR);
     } else {
       setToolTipText(activeUser.getEmail());
       myPresentation.setDescription(activeUser.getEmail());
       Image image = activeUser.getPicture();
       if(image == null) {
-        myPresentation.setIcon(defaultIcon);
+        myPresentation.setIcon(GoogleLoginIcons.DEFAULT_USER_AVATAR);
       } else {
         Image scaledImage = image.getScaledInstance(16, 16, Image.SCALE_SMOOTH);
         myPresentation.setIcon(new ImageIcon(scaledImage));