Merge pull request #33 from csimmonsbluebook/master

Fetch note from the contact
tamir7 · May 22, 2017 · 7cfa0a7 · 7cfa0a7
2 parents c21386a + 296f4af
commit 7cfa0a7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/contacts/src/main/java/com/github/tamir7/contacts/Contact.java b/contacts/src/main/java/com/github/tamir7/contacts/Contact.java
@@ -41,6 +41,7 @@ public final class Contact {
     private String companyTitle;
     private final Set<String> websites = new HashSet<>();
     private final Set<Address> addresses = new HashSet<>();
+    private String note;
 
     interface AbstractField {
         String getMimeType();
@@ -82,6 +83,8 @@ public enum Field implements AbstractField {
                 ContactsContract.CommonDataKinds.Organization.TITLE),
         Website(ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE,
                 ContactsContract.CommonDataKinds.Website.URL),
+        Note(ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE,
+                ContactsContract.CommonDataKinds.Note.NOTE),
         Address(ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE,
                 ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS),
         AddressType(ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE,
@@ -197,6 +200,11 @@ Contact addWebsite(String website) {
         return this;
     }
 
+    Contact addNote(String note) {
+        this.note = note;
+        return this;
+    }
+
     Contact addAddress(Address address) {
         addresses.add(address);
         return this;
@@ -319,6 +327,15 @@ public String getCompanyTitle() {
     public List<String> getWebsites() {
         return Arrays.asList(websites.toArray(new String[websites.size()]));
     }
+
+    /**
+     * Gets the note of the contact
+     *
+     * @return the note
+     */
+    public String getNote() {
+        return note;
+    }
 
     /**
      * Gets the list of addresses

diff --git a/contacts/src/main/java/com/github/tamir7/contacts/CursorHelper.java b/contacts/src/main/java/com/github/tamir7/contacts/CursorHelper.java
@@ -58,6 +58,10 @@ String getWebsite() {
         return getString(c, ContactsContract.CommonDataKinds.Website.URL);
     }
 
+    String getNote() {
+        return getString(c, ContactsContract.CommonDataKinds.Note.NOTE);
+    }
+
     Address getAddress() {
         String address = getString(c, ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS);
         if (address == null) {

diff --git a/contacts/src/main/java/com/github/tamir7/contacts/Query.java b/contacts/src/main/java/com/github/tamir7/contacts/Query.java
@@ -318,6 +318,11 @@ private void updateContact(Contact contact, CursorHelper helper) {
             if (website != null) {
                 contact.addWebsite(website);
             }
+        } else if (mimeType.equals(ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE)) {
+            String note = helper.getNote();
+            if (note != null) {
+                contact.addNote(note);
+            }
         } else if (mimeType.equals(ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)) {
             Address address = helper.getAddress();
             if (address != null) {