ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 286313b4: am faae6edc: Fix problem in which email/phone #\'s could get erased erroneously

Browse Source 
Merge commit '286313b476a3a59c2f5adb9c6b86b8d641e73c31'

* commit '286313b476a3a59c2f5adb9c6b86b8d641e73c31':
  Fix problem in which email/phone #'s could get erased erroneously
This commit is contained in:
Marc Blank 2009-10-01 13:52:47 -07:00 committed by Android Git Automerger
commit 1d5fac295f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/exchange/adapter/ContactsSyncAdapter.java
View File

@ -1330,20 +1330,21 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
public void addUntyped(Entity entity, ArrayList<UntypedRow> rows, String mimeType,
int type, int maxRows) {
// Make a list of all same type rows in the existing entity
ArrayList<NamedContentValues> oldAccounts = new ArrayList<NamedContentValues>();
ArrayList<NamedContentValues> oldValues = new ArrayList<NamedContentValues>();
ArrayList<NamedContentValues> entityValues = entity.getSubValues();
if (entity != null) {
oldAccounts = findUntypedData(entity.getSubValues(), type, mimeType);
oldValues = findUntypedData(entityValues, type, mimeType);
}
// These will be rows needing replacement with new values
ArrayList<UntypedRow> rowsToReplace = new ArrayList<UntypedRow>();
// The count of existing rows
int numRows = oldAccounts.size();
int numRows = oldValues.size();
for (UntypedRow row: rows) {
boolean found = false;
// If we already have this IM address, mark it
for (NamedContentValues ncv: oldAccounts) {
// If we already have this row, mark it
for (NamedContentValues ncv: oldValues) {
ContentValues cv = ncv.values;
String data = cv.getAsString(COMMON_DATA_ROW);
int rowType = -1;
@ -1352,6 +1353,8 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
}
if (row.isSameAs(rowType, data)) {
cv.put(FOUND_DATA_ROW, true);
// Remove this to indicate it's still being used
entityValues.remove(ncv);
found = true;
break;
}
@ -1373,7 +1376,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
// Go through rows needing replacement
for (UntypedRow row: rowsToReplace) {
for (NamedContentValues ncv: oldAccounts) {
for (NamedContentValues ncv: oldValues) {
ContentValues cv = ncv.values;
// Find a row that hasn't been used (i.e. doesn't match current rows)
if (!cv.containsKey(FOUND_DATA_ROW)) {