Autofill saves duplicate profiles and credit card info in preferences

chrome/browser/autofill/autofill_dialog_controller_mac.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/autofill/autofill_dialog_controller_mac.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/lazy_instance.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/autofill/autofill_address_model_mac.h"
 #import "chrome/browser/autofill/autofill_address_sheet_controller_mac.h"
 #import "chrome/browser/autofill/autofill_credit_card_model_mac.h"
 #import "chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.h"
+#import "chrome/browser/autofill/autofill-inl.h"
 #import "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/pref_names.h"
@@ skipping 62 matching lines @@
 // Asyncronous handler for when PersonalDataManager data changes.  The
 // personal data manager notifies the dialog with this method when the
 // data has changed.
 - (void)onPersonalDataChanged:(const std::vector<AutoFillProfile*>&)profiles
                   creditCards:(const std::vector<CreditCard*>&)creditCards;
 
 // Called upon changes to AutoFill preferences that should be reflected in the
 // UI.
 - (void)preferenceDidChange:(const std::string&)preferenceName;
 
+// Adjust the selected index when underlying data changes.
+// Selects the previous row if possible, else current row, else deselect all.
+- (void) adjustSelectionOnDelete:(NSInteger)selectedRow;
+
+// Adjust the selected index when underlying data changes.
+// Selects the current row if possible, else previous row, else deselect all.
+- (void) adjustSelectionOnReload:(NSInteger)selectedRow;
+
 // Returns true if |row| is an index to a valid profile in |tableView_|, and
 // false otherwise.
 - (BOOL)isProfileRow:(NSInteger)row;
 
 // Returns true if |row| is an index to the profile group row in |tableView_|,
 // and false otherwise.
 - (BOOL)isProfileGroupRow:(NSInteger)row;
 
 // Returns true if |row| is an index to a valid credit card in |tableView_|, and
 // false otherwise.
@@ skipping 218 matching lines @@
 // Add address sheet was dismissed.  Non-zero |returnCode| indicates a save.
 - (void)addressAddDidEnd:(NSWindow*)sheet
               returnCode:(int)returnCode
              contextInfo:(void*)contextInfo {
   DCHECK(contextInfo == NULL);
 
   if (returnCode) {
     // Create a new address and save it to the |profiles_| list.
     AutoFillProfile newAddress;
     [addressSheetController copyModelToProfile:&newAddress];
-    if (!newAddress.IsEmpty()) {
+    if (!newAddress.IsEmpty() && !FindByContents(profiles_, newAddress)) {
       profiles_.push_back(newAddress);
 
       // Saving will save to the PDM and the table will refresh when PDM sends
       // notification that the underlying model has changed.
       [self save];
 
       // Update the selection to the newly added item.
       NSInteger row = [self rowFromProfileIndex:profiles_.size() - 1];
       [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
               byExtendingSelection:NO];
     }
   }
   [sheet orderOut:self];
   addressSheetController.reset(nil);
 }
 
 // Add credit card sheet was dismissed.  Non-zero |returnCode| indicates a save.
 - (void)creditCardAddDidEnd:(NSWindow *)sheet
                  returnCode:(int)returnCode
                 contextInfo:(void *)contextInfo {
   DCHECK(contextInfo == NULL);
 
   if (returnCode) {
     // Create a new credit card and save it to the |creditCards_| list.
     CreditCard newCreditCard;
     [creditCardSheetController copyModelToCreditCard:&newCreditCard];
-    if (!newCreditCard.IsEmpty()) {
+    if (!newCreditCard.IsEmpty() &&
+        !FindByContents(creditCards_, newCreditCard)) {
       creditCards_.push_back(newCreditCard);
 
       // Saving will save to the PDM and the table will refresh when PDM sends
       // notification that the underlying model has changed.
       [self save];
 
       // Update the selection to the newly added item.
       NSInteger row = [self rowFromCreditCardIndex:creditCards_.size() - 1];
       [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
               byExtendingSelection:NO];
@@ skipping 20 matching lines @@
     if ([self isProfileRow:i]) {
       profiles_.erase(
           profiles_.begin() + [self profileIndexFromRow:i]);
     } else if ([self isCreditCardRow:i]) {
       creditCards_.erase(
           creditCards_.begin() + [self creditCardIndexFromRow:i]);
     }
   }
 
   // Select the previous row if possible, else current row, else deselect all.
-  if ([self tableView:tableView_ shouldSelectRow:selectedRow-1]) {
-    [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow-1]
-            byExtendingSelection:NO];
-  } else if ([self tableView:tableView_ shouldSelectRow:selectedRow]) {
-    [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow]
-            byExtendingSelection:NO];
-  } else {
-    [tableView_ deselectAll:self];
-  }
+  [self adjustSelectionOnDelete:selectedRow];
 
   // Saving will save to the PDM and the table will refresh when PDM sends
   // notification that the underlying model has changed.
   [self save];
 }
 
 // Edits the selected item, either address or credit card depending on the item
 // selected.
 - (IBAction)editSelection:(id)sender {
   NSInteger selectedRow = [tableView_ selectedRow];
@@ skipping 370 matching lines @@
   for (std::vector<AutoFillProfile*>::const_iterator iter = profiles.begin();
        iter != profiles.end(); ++iter)
     profiles_.push_back(**iter);
 
   // Make local copy of |creditCards|.
   creditCards_.clear();
   for (std::vector<CreditCard*>::const_iterator iter = creditCards.begin();
        iter != creditCards.end(); ++iter)
     creditCards_.push_back(**iter);
 
+  [self adjustSelectionOnReload:[tableView_ selectedRow]];
   [tableView_ reloadData];
 }
 
 - (void)preferenceDidChange:(const std::string&)preferenceName {
   if (preferenceName == prefs::kAutoFillEnabled) {
     [self setAutoFillEnabled:autoFillEnabled_.GetValue()];
     [self setAutoFillManaged:autoFillEnabled_.IsManaged()];
     [self setAutoFillManagedAndDisabled:
         autoFillEnabled_.IsManaged() && !autoFillEnabled_.GetValue()];
   } else if (preferenceName == prefs::kAutoFillAuxiliaryProfilesEnabled) {
     [self setAuxiliaryEnabled:auxiliaryEnabled_.GetValue()];
   } else {
     NOTREACHED();
   }
 }
 
+- (void) adjustSelectionOnDelete:(NSInteger)selectedRow {
+  if ([self tableView:tableView_ shouldSelectRow:selectedRow-1]) {
+    [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow-1]
+            byExtendingSelection:NO];
+  } else if ([self tableView:tableView_ shouldSelectRow:selectedRow]) {
+    [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow]
+            byExtendingSelection:NO];
+  } else {
+    [tableView_ deselectAll:self];
+  }
+}
+
+- (void) adjustSelectionOnReload:(NSInteger)selectedRow {
+  if ([self tableView:tableView_ shouldSelectRow:selectedRow]) {
+    [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow]
+            byExtendingSelection:NO];
+  } else if ([self tableView:tableView_ shouldSelectRow:selectedRow-1]) {
+    [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow-1]
+            byExtendingSelection:NO];
+  } else {
+    [tableView_ deselectAll:self];
+  }
+}
+
 - (BOOL)isProfileRow:(NSInteger)row {
   if (row > 0 && static_cast<size_t>(row) <= profiles_.size())
     return YES;
   return NO;
 }
 
 - (BOOL)isProfileGroupRow:(NSInteger)row {
   if (row == 0)
     return YES;
   return NO;
@@ skipping 77 matching lines @@
   if (!image) {
     image = rb.GetNativeImageNamed(IDR_INPUT_GOOD);
     DCHECK(image);
     return image;
   }
 
   return nil;
 }
 
 @end