Handle avatar URLs with existing resize directives (#3643)

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.login.test/src/com/google/cloud/tools/eclipse/login/ui/AccountsPanelTest.java

@@ -168,6 +168,13 @@ public void testAccountsArea_threeAccounts() {
     assertTrue(namesEmails.names.contains("Charlie"));
   }
 
+  @Test
+  public void testResizedImageUrl() {
+    assertEquals("https://lh3/xxxx=s48", AccountsPanel.resizedImageUrl("https://lh3/xxxx", 48));
+    assertEquals(
+        "https://lh3/xxxx=s48", AccountsPanel.resizedImageUrl("https://lh3/xxxx=s96-c", 48));
+  }
+
   private void setUpLoginService(List<Account> accounts) {
     when(loginService.hasAccounts()).thenReturn(!accounts.isEmpty());
     when(loginService.getAccounts()).thenReturn(new HashSet<>(accounts));

plugins/com.google.cloud.tools.eclipse.login/src/com/google/cloud/tools/eclipse/login/ui/AccountsPanel.java

@@ -112,14 +112,31 @@ void createAccountsPane(Composite accountArea) {
 
       if (account.getAvatarUrl() != null) {
         try {
-          imageLoader.loadImage(account.getAvatarUrl() + "=s" + avatarSize, avatar);
+          String url = resizedImageUrl(account.getAvatarUrl(), avatarSize);
+          imageLoader.loadImage(url, avatar);
         } catch (MalformedURLException ex) {
           logger.log(Level.WARNING, "malformed avatar image URL", ex);
         }
       }
     }
   }
 
+  /**
+   * Apply a resize directive to an Google avatar URL, replacing any previous resize directives.
+   *
+   * @param avatarUrl the URL
+   * @param avatarSize the desired image size
+   * @return an amended URL
+   */
+  @VisibleForTesting
+  static String resizedImageUrl(String avatarUrl, int avatarSize) {
+    int index = avatarUrl.lastIndexOf('=');
+    if (index > 0) {
+      avatarUrl = avatarUrl.substring(0, index);
+    }
+    return avatarUrl + "=s" + avatarSize;
+  }
+
   private void createButtons(Composite container) {
     Composite buttonArea = new Composite(container, SWT.NONE);
     GridLayoutFactory.fillDefaults().numColumns(2).applyTo(buttonArea);