[TouchToFill][Android] Formatted blank usernames

This CL ensures that blank usernames display a translated version
instead of an empty string.

Bug: 1011836
Change-Id: Ic473e5adc59375c638c04b60ca81e0934891aec6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1847303
Commit-Queue: Friedrich [CET] <fhorschig@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703786}

chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillBridge.java

@@ -44,8 +44,10 @@ class TouchToFillBridge implements TouchToFillComponent.Delegate {
 
     @CalledByNative
     private static void insertCredential(Credential[] credentials, int index, String username,
-            String password, String originUrl, boolean isPublicSuffixMatch) {
-        credentials[index] = new Credential(username, password, originUrl, isPublicSuffixMatch);
+            String password, String formattedUsername, String originUrl,
+            boolean isPublicSuffixMatch) {
+        credentials[index] = new Credential(
+                username, password, formattedUsername, originUrl, isPublicSuffixMatch);
     }
 
     @CalledByNative

chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillViewBinder.java

@@ -42,7 +42,7 @@ class TouchToFillViewBinder {
      */
     static void bindCredentialView(View view, Credential credential) {
         TextView usernameText = view.findViewById(R.id.username);
-        usernameText.setText(credential.getUsername());
+        usernameText.setText(credential.getFormattedUsername());
 
         TextView passwordText = view.findViewById(R.id.password);
         passwordText.setText(credential.getPassword());

chrome/browser/touch_to_fill/android/java/src/org/chromium/chrome/browser/touch_to_fill/data/Credential.java

@@ -12,6 +12,7 @@ import org.chromium.base.annotations.CalledByNative;
 public class Credential {
     private final String mUsername;
     private final String mPassword;
+    private final String mFormattedUsername;
     private final String mOriginUrl;
     private final boolean mIsPublicSuffixMatch;
 
@@ -21,10 +22,11 @@ public class Credential {
      * @param originUrl Origin URL shown to the user in case this credential is a PSL match.
      * @param isPublicSuffixMatch Indicating whether the credential is a PSL match.
      */
-    public Credential(
-            String username, String password, String originUrl, boolean isPublicSuffixMatch) {
+    public Credential(String username, String password, String formattedUsername, String originUrl,
+            boolean isPublicSuffixMatch) {
         mUsername = username;
         mPassword = password;
+        mFormattedUsername = formattedUsername;
         mOriginUrl = originUrl;
         mIsPublicSuffixMatch = isPublicSuffixMatch;
     }
@@ -39,6 +41,10 @@ public class Credential {
         return mPassword;
     }
 
+    public String getFormattedUsername() {
+        return mFormattedUsername;
+    }
+
     @CalledByNative
     public String getOriginUrl() {
         return mOriginUrl;

chrome/browser/touch_to_fill/android/javatests/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillIntegrationTest.java

@@ -46,8 +46,9 @@ import java.util.Arrays;
 public class TouchToFillIntegrationTest {
     private static final String EXAMPLE_URL = "www.example.xyz";
     private static final String MOBILE_URL = "m.example.xyz";
-    private static final Credential ANA = new Credential("Ana", "S3cr3t", EXAMPLE_URL, false);
-    private static final Credential BOB = new Credential("Bob", "*****", MOBILE_URL, true);
+    private static final Credential ANA =
+            new Credential("Ana", "S3cr3t", "Ana", EXAMPLE_URL, false);
+    private static final Credential BOB = new Credential("Bob", "*****", "Bob", MOBILE_URL, true);
 
     private final TouchToFillComponent mTouchToFill = new TouchToFillCoordinator();
 

chrome/browser/touch_to_fill/android/javatests/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillViewTest.java

@@ -111,8 +111,8 @@ public class TouchToFillViewTest {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             mTouchToFillView.setVisible(true);
             mModel.get(CREDENTIAL_LIST)
-                    .addAll(Arrays.asList(new Credential("Ana", "S3cr3t", null, false),
-                            new Credential("Bob", "***", "m.example.xyz", true)));
+                    .addAll(Arrays.asList(new Credential("Ana", "S3cr3t", "Ana", null, false),
+                            new Credential("", "***", "No Username", "m.example.xyz", true)));
         });
 
         pollUiThread(() -> getBottomSheetState() == SheetState.FULL);
@@ -121,7 +121,7 @@ public class TouchToFillViewTest {
         assertThat(getCredentialPasswordAt(0).getText(), is("S3cr3t"));
         assertThat(getCredentialPasswordAt(0).getTransformationMethod(),
                 instanceOf(PasswordTransformationMethod.class));
-        assertThat(getCredentialNameAt(1).getText(), is("Bob"));
+        assertThat(getCredentialNameAt(1).getText(), is("No Username"));
         assertThat(getCredentialPasswordAt(1).getText(), is("***"));
         assertThat(getCredentialPasswordAt(1).getTransformationMethod(),
                 instanceOf(PasswordTransformationMethod.class));
@@ -132,8 +132,8 @@ public class TouchToFillViewTest {
     public void testCredentialsAreClickable() {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             mModel.get(CREDENTIAL_LIST)
-                    .addAll(Arrays.asList(new Credential("Carl", "G3h3!m", "", false),
-                            new Credential("Bob", "***", "m.example.xyz", true)));
+                    .addAll(Arrays.asList(new Credential("Carl", "G3h3!m", "Carl", "", false),
+                            new Credential("Bob", "***", "Bob", "m.example.xyz", true)));
             mModel.set(VISIBLE, true);
         });
         pollUiThread(() -> getBottomSheetState() == SheetState.FULL);

chrome/browser/touch_to_fill/android/junit/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillControllerTest.java

@@ -36,9 +36,10 @@ import java.util.Collections;
 public class TouchToFillControllerTest {
     private static final String TEST_URL = "www.example.xyz";
     private static final String TEST_MOBILE_URL = "www.example.xyz";
-    private static final Credential ANA = new Credential("Ana", "S3cr3t", null, false);
-    private static final Credential BOB = new Credential("Bob", "*****", TEST_MOBILE_URL, true);
-    private static final Credential CARL = new Credential("Carl", "G3h3!m", "", false);
+    private static final Credential ANA = new Credential("Ana", "S3cr3t", "Ana", null, false);
+    private static final Credential BOB =
+            new Credential("Bob", "*****", "Bob", TEST_MOBILE_URL, true);
+    private static final Credential CARL = new Credential("Carl", "G3h3!m", "Carl", "", false);
 
     @Mock
     private TouchToFillComponent.Delegate mMockDelegate;

chrome/browser/touch_to_fill/android/touch_to_fill_view_impl.cc

@@ -13,6 +13,7 @@
 #include "chrome/browser/password_manager/touch_to_fill_controller.h"
 #include "chrome/browser/touch_to_fill/android/jni_headers/Credential_jni.h"
 #include "chrome/browser/touch_to_fill/android/jni_headers/TouchToFillBridge_jni.h"
+#include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "components/password_manager/core/browser/origin_credential_store.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
@@ -70,6 +71,7 @@ void TouchToFillViewImpl::Show(
         env, credential_array, i,
         ConvertUTF16ToJavaString(env, credential.username),
         ConvertUTF16ToJavaString(env, credential.password),
+        ConvertUTF16ToJavaString(env, GetDisplayUsername(credential)),
         ConvertUTF8ToJavaString(env, credential.origin_url.spec()),
         credential.is_public_suffix_match);
   }