Displaying human-readable Android credentials on Android OS.

chrome/browser/android/password_ui_view_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/password_ui_view_android.h"
 
+#include <algorithm>
+
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/metrics/field_trial.h"
+#include "base/strings/string_piece.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/password_manager/core/browser/affiliation_utils.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/password_manager/core/browser/password_manager_constants.h"
+#include "components/password_manager/core/browser/password_ui_utils.h"
 #include "components/password_manager/core/common/experiments.h"
 #include "jni/PasswordUIView_jni.h"
+#include "ui/base/l10n/l10n_util.h"
 
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
+namespace {
+
+// Returns the human readable version of the origin string displayed in
+// Chrome settings for |form|.
+std::string GetDisplayOriginForSettings(const autofill::PasswordForm& form) {
+  bool is_android_uri = false;
+  bool is_clickable = false;
+  GURL link_url;  // TODO(crbug.com/617094) Also display link_url.
+  std::string human_readable_origin =
+      password_manager::GetShownOriginAndLinkUrl(form, &is_android_uri,
+                                                 &link_url,
+                                                 &is_clickable);
+  if (!is_clickable) {
+    DCHECK(is_android_uri);
+    human_readable_origin = password_manager::SplitByDotAndReverse(
+        base::StringPiece(
+            &human_readable_origin[

[Bernhard Bauer, 2016/06/13 09:34:59]

This alignment is kind of weird, but I suspect it would change anyway if we
don't access kAndroidAppSchemeAndDelimiterLength from a different namespace (see
my comment in password_manager_presenter.cc).

[dozsa, 2016/06/13 12:36:17]

Done.

+                                   password_manager::
+                                   kAndroidAppSchemeAndDelimiterLength],
+                                   human_readable_origin.length() -
+                    password_manager::kAndroidAppSchemeAndDelimiterLength));
+    human_readable_origin = human_readable_origin +
+        l10n_util::GetStringUTF8(IDS_PASSWORDS_ANDROID_URI_SUFFIX);

[Bernhard Bauer, 2016/06/13 09:34:59]

Manually composing user-visible localized strings like that seems... off. I
think it would be better to make the localized resource a format string and pass
the origin in as a parameter.

[vabr (Chromium), 2016/06/13 09:45:20]

While I agree with this observation, I would suggest to do it in a separate CL.
The current usage is already present in the desktop settings, so those would
have to be changed here as well. Let's not bloat the CL and let it serve 2
purposes.

[dozsa, 2016/06/13 12:36:17]

Acknowledged.

+  }
+  return human_readable_origin;
+}
+
+}  // namespace
+
 PasswordUIViewAndroid::PasswordUIViewAndroid(JNIEnv* env, jobject obj)
     : password_manager_presenter_(this), weak_java_ui_controller_(env, obj) {}
 
 PasswordUIViewAndroid::~PasswordUIViewAndroid() {}
 
 void PasswordUIViewAndroid::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
   delete this;
 }
 
 Profile* PasswordUIViewAndroid::GetProfile() {
@@ skipping 41 matching lines @@
     const JavaParamRef<jobject>&,
     int index) {
   const autofill::PasswordForm* form =
       password_manager_presenter_.GetPassword(index);
   if (!form) {
     return Java_PasswordUIView_createSavedPasswordEntry(
         env,
         ConvertUTF8ToJavaString(env, std::string()).obj(),
         ConvertUTF16ToJavaString(env, base::string16()).obj());
   }
-  std::string human_readable_origin =
-      password_manager::GetHumanReadableOrigin(*form);
+  std::string human_readable_origin = GetDisplayOriginForSettings(*form);
   return Java_PasswordUIView_createSavedPasswordEntry(
       env, ConvertUTF8ToJavaString(env, human_readable_origin).obj(),
       ConvertUTF16ToJavaString(env, form->username_value).obj());
 }
 
 ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException(
     JNIEnv* env,
     const JavaParamRef<jobject>&,
     int index) {
   const autofill::PasswordForm* form =
       password_manager_presenter_.GetPasswordException(index);
   if (!form)
     return ConvertUTF8ToJavaString(env, std::string());
-  std::string human_readable_origin =
-      password_manager::GetHumanReadableOrigin(*form);
+  std::string human_readable_origin = GetDisplayOriginForSettings(*form);
   return ConvertUTF8ToJavaString(env, human_readable_origin);
 }
 
 void PasswordUIViewAndroid::HandleRemoveSavedPasswordEntry(
     JNIEnv* env,
     const JavaParamRef<jobject>&,
     int index) {
   password_manager_presenter_.RemoveSavedPassword(index);
 }
 
@@ skipping 21 matching lines @@
 
 // static
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   PasswordUIViewAndroid* controller = new PasswordUIViewAndroid(env, obj);
   return reinterpret_cast<intptr_t>(controller);
 }
 
 bool PasswordUIViewAndroid::RegisterPasswordUIViewAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }