Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 850430 - Handle new defaults correctly in the Android contacts backend. r=cpeterson

Browse Source
This commit is contained in:
Reuben Morais 2013-09-29 22:22:35 -03:00
parent 3221fe0c2f
commit 8e3961c53d
2 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/webidl/Contacts.webidl
View File

@ -152,7 +152,7 @@ dictionary ContactFindOptions : ContactFindSortOptions {
DOMString filterValue; // e.g. "Tom"
DOMString filterOp; // e.g. "startsWith"
any filterBy; // e.g. ["givenName", "nickname"]
unsigned long filterLimit;
unsigned long filterLimit = 0;
};
[NoInterfaceObject, NavigatorProperty="mozContacts",

88
mobile/android/base/ContactService.java
View File

@ -214,10 +214,10 @@ public class ContactService implements GeckoEventListener {
sortBy = findOptions.optString("sortBy").toLowerCase();
sortOrder = findOptions.optString("sortOrder").toLowerCase();
if ("undefined".equals(sortBy)) {
if ("".equals(sortBy)) {
sortBy = null;
}
if ("undefined".equals(sortOrder)) {
if ("".equals(sortOrder)) {
sortOrder = "ascending";
}
@ -240,15 +240,15 @@ public class ContactService implements GeckoEventListener {
try {
final JSONObject findOptions = contactOptions.getJSONObject("findOptions");
String filterValue = findOptions.getString("filterValue");
String filterValue = findOptions.optString("filterValue");
JSONArray filterBy = findOptions.optJSONArray("filterBy");
final String filterOp = findOptions.getString("filterOp");
final String filterOp = findOptions.optString("filterOp");
final int filterLimit = findOptions.getInt("filterLimit");
final int substringMatching = findOptions.getInt("substringMatching");
// If filter value is undefined, avoid all the logic below and just return
// all available raw contact IDs
if ("undefined".equals(filterValue)) {
if ("".equals(filterValue) || "".equals(filterOp)) {
long[] allRawContactIds = getAllRawContactIds();
// Truncate the raw contacts IDs array if necessary
@ -972,7 +972,7 @@ public class ContactService implements GeckoEventListener {
}
}
private void insertContact(final JSONObject contactProperties, final String requestID) {
private void insertContact(final JSONObject contactProperties, final String requestID) throws JSONException {
ArrayList<ContentProviderOperation> newContactOptions = new ArrayList<ContentProviderOperation>();
// Account to save the contact under
@ -1018,7 +1018,7 @@ public class ContactService implements GeckoEventListener {
new Object[] {newRawContactId, "create"});
}
private void updateContact(final JSONObject contactProperties, final long rawContactId, final String requestID) {
private void updateContact(final JSONObject contactProperties, final long rawContactId, final String requestID) throws JSONException {
// Why is updating a contact so weird and horribly inefficient? Because Android doesn't
// like multiple values for contact fields, but the Mozilla contacts API calls for this.
// This means the Android update function is essentially completely useless. Why not just
@ -1069,65 +1069,61 @@ public class ContactService implements GeckoEventListener {
new Object[] {rawContactId, "update"});
}
private List<ContentValues> getContactValues(final JSONObject contactProperties) {
private List<ContentValues> getContactValues(final JSONObject contactProperties) throws JSONException {
List<ContentValues> contactValues = new ArrayList<ContentValues>();
try {
// Add the contact to the default group so it is shown in other apps
// like the Contacts or People app
ContentValues defaultGroupValues = new ContentValues();
defaultGroupValues.put(Data.MIMETYPE, GroupMembership.CONTENT_ITEM_TYPE);
defaultGroupValues.put(GroupMembership.GROUP_ROW_ID, mGroupId);
contactValues.add(defaultGroupValues);
// Add the contact to the default group so it is shown in other apps
// like the Contacts or People app
ContentValues defaultGroupValues = new ContentValues();
defaultGroupValues.put(Data.MIMETYPE, GroupMembership.CONTENT_ITEM_TYPE);
defaultGroupValues.put(GroupMembership.GROUP_ROW_ID, mGroupId);
contactValues.add(defaultGroupValues);
// Create all the values that will be inserted into the new contact
getNameValues(contactProperties.optJSONArray("name"),
contactProperties.optJSONArray("givenName"),
contactProperties.optJSONArray("familyName"),
contactProperties.optJSONArray("honorificPrefix"),
contactProperties.optJSONArray("honorificSuffix"),
contactValues);
// Create all the values that will be inserted into the new contact
getNameValues(contactProperties.optJSONArray("name"),
contactProperties.optJSONArray("givenName"),
contactProperties.optJSONArray("familyName"),
contactProperties.optJSONArray("honorificPrefix"),
contactProperties.optJSONArray("honorificSuffix"),
contactValues);
getGenericValues(MIMETYPE_ADDITIONAL_NAME, CUSTOM_DATA_COLUMN,
contactProperties.optJSONArray("additionalName"), contactValues);
getGenericValues(MIMETYPE_ADDITIONAL_NAME, CUSTOM_DATA_COLUMN,
contactProperties.optJSONArray("additionalName"), contactValues);
getNicknamesValues(contactProperties.optJSONArray("nickname"), contactValues);
getNicknamesValues(contactProperties.optJSONArray("nickname"), contactValues);
getAddressesValues(contactProperties.optJSONArray("adr"), contactValues);
getAddressesValues(contactProperties.optJSONArray("adr"), contactValues);
getPhonesValues(contactProperties.optJSONArray("tel"), contactValues);
getPhonesValues(contactProperties.optJSONArray("tel"), contactValues);
getEmailsValues(contactProperties.optJSONArray("email"), contactValues);
getEmailsValues(contactProperties.optJSONArray("email"), contactValues);
//getPhotosValues(contactProperties.optJSONArray("photo"), contactValues);
//getPhotosValues(contactProperties.optJSONArray("photo"), contactValues);
getGenericValues(Organization.CONTENT_ITEM_TYPE, Organization.COMPANY,
contactProperties.optJSONArray("org"), contactValues);
getGenericValues(Organization.CONTENT_ITEM_TYPE, Organization.COMPANY,
contactProperties.optJSONArray("org"), contactValues);
getGenericValues(Organization.CONTENT_ITEM_TYPE, Organization.TITLE,
contactProperties.optJSONArray("jobTitle"), contactValues);
getGenericValues(Organization.CONTENT_ITEM_TYPE, Organization.TITLE,
contactProperties.optJSONArray("jobTitle"), contactValues);
getNotesValues(contactProperties.optJSONArray("note"), contactValues);
getNotesValues(contactProperties.optJSONArray("note"), contactValues);
getWebsitesValues(contactProperties.optJSONArray("url"), contactValues);
getWebsitesValues(contactProperties.optJSONArray("url"), contactValues);
getImsValues(contactProperties.optJSONArray("impp"), contactValues);
getImsValues(contactProperties.optJSONArray("impp"), contactValues);
getCategoriesValues(contactProperties.optJSONArray("category"), contactValues);
getCategoriesValues(contactProperties.optJSONArray("category"), contactValues);
getEventValues(contactProperties.optString("bday"), Event.TYPE_BIRTHDAY, contactValues);
getEventValues(contactProperties.optString("bday"), Event.TYPE_BIRTHDAY, contactValues);
getEventValues(contactProperties.optString("anniversary"), Event.TYPE_ANNIVERSARY, contactValues);
getEventValues(contactProperties.optString("anniversary"), Event.TYPE_ANNIVERSARY, contactValues);
getCustomMimetypeValues(contactProperties.optString("sex"), MIMETYPE_SEX, contactValues);
getCustomMimetypeValues(contactProperties.optString("sex"), MIMETYPE_SEX, contactValues);
getCustomMimetypeValues(contactProperties.optString("genderIdentity"), MIMETYPE_GENDER_IDENTITY, contactValues);
getCustomMimetypeValues(contactProperties.optString("genderIdentity"), MIMETYPE_GENDER_IDENTITY, contactValues);
getGenericValues(MIMETYPE_KEY, CUSTOM_DATA_COLUMN, contactProperties.optJSONArray("key"),
contactValues);
} catch (JSONException e) {
throw new IllegalArgumentException("Unexpected or missing JSON data: " + e);
}
getGenericValues(MIMETYPE_KEY, CUSTOM_DATA_COLUMN, contactProperties.optJSONArray("key"),
contactValues);
return contactValues;
}