Redo Autofill wallet preferences on Android.

chrome/browser/autofill/android/personal_data_manager_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/autofill/android/personal_data_manager_android.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
@@ skipping 28 matching lines @@
 }
 
 PrefService* GetPrefs() {
   return GetProfile()->GetPrefs();
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaProfileFromNative(
     JNIEnv* env,
     const AutofillProfile& profile) {
   return Java_AutofillProfile_create(
-      env,
-      ConvertUTF8ToJavaString(env, profile.guid()).obj(),
+      env, ConvertUTF8ToJavaString(env, profile.guid()).obj(),
       ConvertUTF8ToJavaString(env, profile.origin()).obj(),
+      profile.record_type() == AutofillProfile::LOCAL_PROFILE,
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(NAME_FULL)).obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(COMPANY_NAME)).obj(),
       ConvertUTF16ToJavaString(
           env, profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS)).obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_STATE))
           .obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_CITY))
           .obj(),
       ConvertUTF16ToJavaString(
           env, profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY)).obj(),
@@ skipping 71 matching lines @@
       g_browser_process->GetApplicationLocale());
   profile->set_language_code(
       ConvertJavaStringToUTF8(
           Java_AutofillProfile_getLanguageCode(env, jprofile)));
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(
     JNIEnv* env,
     const CreditCard& card) {
   return Java_CreditCard_create(
-      env,
-      ConvertUTF8ToJavaString(env, card.guid()).obj(),
+      env, ConvertUTF8ToJavaString(env, card.guid()).obj(),
       ConvertUTF8ToJavaString(env, card.origin()).obj(),
+      card.record_type() == CreditCard::LOCAL_CARD,
+      card.record_type() == CreditCard::FULL_SERVER_CARD,
       ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NAME)).obj(),
       ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NUMBER)).obj(),
       ConvertUTF16ToJavaString(env, card.TypeAndLastFourDigits()).obj(),
+      ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_EXP_MONTH))
+          .obj(),
       ConvertUTF16ToJavaString(
-          env,
-          card.GetRawInfo(CREDIT_CARD_EXP_MONTH)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR)).obj());
+          env, card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR)).obj());
 }
 
 void PopulateNativeCreditCardFromJava(
     const jobject& jcard,
     JNIEnv* env,
     CreditCard* card) {
   card->set_origin(
       ConvertJavaStringToUTF8(Java_CreditCard_getOrigin(env, jcard)));
   card->SetRawInfo(
       CREDIT_CARD_NAME,
@@ skipping 18 matching lines @@
           ProfileManager::GetActiveUserProfile())) {
   personal_data_manager_->AddObserver(this);
 }
 
 PersonalDataManagerAndroid::~PersonalDataManagerAndroid() {
   personal_data_manager_->RemoveObserver(this);
 }
 
 jint PersonalDataManagerAndroid::GetProfileCount(JNIEnv* unused_env,
                                                  jobject unused_obj) {
-  return personal_data_manager_->web_profiles().size();
+  return personal_data_manager_->GetProfiles().size();
 }
 
 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByIndex(
     JNIEnv* env,
     jobject unused_obj,
     jint index) {
   const std::vector<AutofillProfile*>& profiles =
-      personal_data_manager_->web_profiles();
+      personal_data_manager_->GetProfiles();
   size_t index_size_t = static_cast<size_t>(index);
   DCHECK_LT(index_size_t, profiles.size());
   return CreateJavaProfileFromNative(env, *profiles[index_size_t]);
 }
 
 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByGUID(
     JNIEnv* env,
     jobject unused_obj,
     jstring jguid) {
   AutofillProfile* profile = personal_data_manager_->GetProfileByGUID(
@@ skipping 23 matching lines @@
   }
 
   return ConvertUTF8ToJavaString(env, profile.guid());
 }
 
 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels(
     JNIEnv* env,
     jobject unused_obj) {
   std::vector<base::string16> labels;
   AutofillProfile::CreateInferredLabels(
-      personal_data_manager_->web_profiles(),
-      NULL,
-      NAME_FULL,
-      2,
-      g_browser_process->GetApplicationLocale(),
-      &labels);
+      personal_data_manager_->GetProfiles(), NULL, NAME_FULL, 2,
+      g_browser_process->GetApplicationLocale(), &labels);
 
   return base::android::ToJavaArrayOfStrings(env, labels);
 }
 
 jint PersonalDataManagerAndroid::GetCreditCardCount(JNIEnv* unused_env,
                                                     jobject unused_obj) {
-  return personal_data_manager_->GetLocalCreditCards().size();
+  return personal_data_manager_->GetCreditCards().size();
 }
 
 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardByIndex(
     JNIEnv* env,
     jobject unused_obj,
     jint index) {
   const std::vector<CreditCard*>& credit_cards =
-      personal_data_manager_->GetLocalCreditCards();
+      personal_data_manager_->GetCreditCards();
   size_t index_size_t = static_cast<size_t>(index);
   DCHECK_LT(index_size_t, credit_cards.size());
   return CreateJavaCreditCardFromNative(env, *credit_cards[index_size_t]);
 }
 
 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardByGUID(
     JNIEnv* env,
     jobject unused_obj,
     jstring jguid) {
   CreditCard* card = personal_data_manager_->GetCreditCardByGUID(
@@ skipping 24 matching lines @@
   return ConvertUTF8ToJavaString(env, card.guid());
 }
 
 void PersonalDataManagerAndroid::RemoveByGUID(JNIEnv* env,
                                               jobject unused_obj,
                                               jstring jguid) {
   personal_data_manager_->RemoveByGUID(ConvertJavaStringToUTF8(env, jguid));
 }
 
 void PersonalDataManagerAndroid::ClearUnmaskedCache(JNIEnv* env,
-                                                    jobject unused_obj) {
-  personal_data_manager_->ResetFullServerCards();
+                                                    jobject unused_obj,
+                                                    jstring guid) {
+  // personal_data_manager_->ResetFullServerCard(ConvertJavaStringToUTF8(env,

[newt (away), 2015/03/18 04:31:45]

TODO?

[Evan Stade, 2015/03/19 00:24:23]

I have no recollection of commenting this out

+  // guid));
 }
 
 void PersonalDataManagerAndroid::OnPersonalDataChanged() {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (weak_java_obj_.get(env).is_null())
     return;
 
   Java_PersonalDataManager_personalDataChanged(env,
                                                weak_java_obj_.get(env).obj());
 }
@@ skipping 49 matching lines @@
           g_browser_process->GetApplicationLocale())).Release();
 }
 
 static jlong Init(JNIEnv* env, jobject obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill