react-native-contacts 7.0.8 → 8.0.1

package/android/src/{main/java → oldarch}/com/rt2zz/reactnativecontacts/ContactsManager.java

@@ -72,7 +72,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
     }
 
     /**
-     * Introduced for iOS compatibility.  Same as getAll
+     * Introduced for iOS compatibility. Same as getAll
      *
      * @param promise promise
      */
@@ -83,12 +83,13 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
 
     /**
      * Retrieves contacts.
-     * Uses raw URI when <code>rawUri</code> is <code>true</code>, makes assets copy otherwise.
+     * Uses raw URI when <code>rawUri</code> is <code>true</code>, makes assets copy
+     * otherwise.
      */
     private void getAllContacts(final Promise promise) {
-        AsyncTask<Void,Void,Void> myAsyncTask = new AsyncTask<Void,Void,Void>() {
+        AsyncTask<Void, Void, Void> myAsyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
-            protected Void doInBackground(final Void ... params) {
+            protected Void doInBackground(final Void... params) {
                 Context context = getReactApplicationContext();
                 ContentResolver cr = context.getContentResolver();
 
@@ -103,9 +104,9 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
 
     @ReactMethod
     public void getCount(final Promise promise) {
-        AsyncTask<Void,Void,Void> myAsyncTask = new AsyncTask<Void,Void,Void>() {
+        AsyncTask<Void, Void, Void> myAsyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
-            protected Void doInBackground(final Void ... params) {
+            protected Void doInBackground(final Void... params) {
                 Context context = getReactApplicationContext();
                 ContentResolver cr = context.getContentResolver();
 
@@ -126,15 +127,16 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
 
     /**
      * Retrieves contacts matching String.
-     * Uses raw URI when <code>rawUri</code> is <code>true</code>, makes assets copy otherwise.
+     * Uses raw URI when <code>rawUri</code> is <code>true</code>, makes assets copy
+     * otherwise.
      *
      * @param searchString String to match
      */
     @ReactMethod
     public void getContactsMatchingString(final String searchString, final Promise promise) {
-        AsyncTask<Void,Void,Void> myAsyncTask = new AsyncTask<Void,Void,Void>() {
+        AsyncTask<Void, Void, Void> myAsyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
-            protected Void doInBackground(final Void ... params) {
+            protected Void doInBackground(final Void... params) {
                 Context context = getReactApplicationContext();
                 ContentResolver cr = context.getContentResolver();
                 ContactsProvider contactsProvider = new ContactsProvider(cr);
@@ -149,15 +151,16 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
 
     /**
      * Retrieves contacts matching a phone number.
-     * Uses raw URI when <code>rawUri</code> is <code>true</code>, makes assets copy otherwise.
+     * Uses raw URI when <code>rawUri</code> is <code>true</code>, makes assets copy
+     * otherwise.
      *
      * @param phoneNumber phone number to match
      */
     @ReactMethod
     public void getContactsByPhoneNumber(final String phoneNumber, final Promise promise) {
-        AsyncTask<Void,Void,Void> myAsyncTask = new AsyncTask<Void,Void,Void>() {
+        AsyncTask<Void, Void, Void> myAsyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
-            protected Void doInBackground(final Void ... params) {
+            protected Void doInBackground(final Void... params) {
                 Context context = getReactApplicationContext();
                 ContentResolver cr = context.getContentResolver();
                 ContactsProvider contactsProvider = new ContactsProvider(cr);
@@ -172,15 +175,16 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
 
     /**
      * Retrieves contacts matching an email address.
-     * Uses raw URI when <code>rawUri</code> is <code>true</code>, makes assets copy otherwise.
+     * Uses raw URI when <code>rawUri</code> is <code>true</code>, makes assets copy
+     * otherwise.
      *
      * @param emailAddress email address to match
      */
     @ReactMethod
     public void getContactsByEmailAddress(final String emailAddress, final Promise promise) {
-        AsyncTask<Void,Void,Void> myAsyncTask = new AsyncTask<Void,Void,Void>() {
+        AsyncTask<Void, Void, Void> myAsyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
-            protected Void doInBackground(final Void ... params) {
+            protected Void doInBackground(final Void... params) {
                 Context context = getReactApplicationContext();
                 ContentResolver cr = context.getContentResolver();
                 ContactsProvider contactsProvider = new ContactsProvider(cr);
@@ -194,15 +198,16 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
     }
 
     /**
-     * Retrieves <code>thumbnailPath</code> for contact, or <code>null</code> if not available.
+     * Retrieves <code>thumbnailPath</code> for contact, or <code>null</code> if not
+     * available.
      *
      * @param contactId contact identifier, <code>recordID</code>
      */
     @ReactMethod
     public void getPhotoForId(final String contactId, final Promise promise) {
-        AsyncTask<Void,Void,Void> myAsyncTask = new AsyncTask<Void,Void,Void>() {
+        AsyncTask<Void, Void, Void> myAsyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
-            protected Void doInBackground(final Void ... params) {
+            protected Void doInBackground(final Void... params) {
                 Context context = getReactApplicationContext();
                 ContentResolver cr = context.getContentResolver();
                 ContactsProvider contactsProvider = new ContactsProvider(cr);
@@ -216,15 +221,16 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
     }
 
     /**
-     * Retrieves <code>contact</code> for contact, or <code>null</code> if not available.
+     * Retrieves <code>contact</code> for contact, or <code>null</code> if not
+     * available.
      *
      * @param contactId contact identifier, <code>recordID</code>
      */
     @ReactMethod
     public void getContactById(final String contactId, final Promise promise) {
-        AsyncTask<Void,Void,Void> myAsyncTask = new AsyncTask<Void,Void,Void>() {
+        AsyncTask<Void, Void, Void> myAsyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
-            protected Void doInBackground(final Void ... params) {
+            protected Void doInBackground(final Void... params) {
                 Context context = getReactApplicationContext();
                 ContentResolver cr = context.getContentResolver();
                 ContactsProvider contactsProvider = new ContactsProvider(cr);
@@ -239,9 +245,9 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
 
     @ReactMethod
     public void writePhotoToPath(final String contactId, final String file, final Promise promise) {
-        AsyncTask<Void,Void,Void> myAsyncTask = new AsyncTask<Void,Void,Void>() {
+        AsyncTask<Void, Void, Void> myAsyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
-            protected Void doInBackground(final Void ... params) {
+            protected Void doInBackground(final Void... params) {
                 Context context = getReactApplicationContext();
                 ContentResolver cr = context.getContentResolver();
 
@@ -279,7 +285,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
         if (photo == null) {
             // Try to find the thumbnail from assets
             AssetManager assetManager = getReactApplicationContext().getAssets();
-            InputStream  inputStream = null;
+            InputStream inputStream = null;
             try {
                 inputStream = assetManager.open(thumbnailPath);
                 photo = BitmapFactory.decodeStream(inputStream);
@@ -455,16 +461,17 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             structuredPostal.put(CommonDataKinds.StructuredPostal.REGION, postalAddressesRegion[i]);
             structuredPostal.put(CommonDataKinds.StructuredPostal.COUNTRY, postalAddressesCountry[i]);
             structuredPostal.put(CommonDataKinds.StructuredPostal.POSTCODE, postalAddressesPostCode[i]);
-            structuredPostal.put(CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS, postalAddressesFormattedAddress[i]);
+            structuredPostal.put(CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS,
+                    postalAddressesFormattedAddress[i]);
             structuredPostal.put(CommonDataKinds.StructuredPostal.LABEL, postalAddressesLabel[i]);
             structuredPostal.put(CommonDataKinds.StructuredPostal.TYPE, postalAddressesType[i]);
-            //No state column in StructuredPostal
-            //structuredPostal.put(CommonDataKinds.StructuredPostal.???, postalAddressesState[i]);
+            // No state column in StructuredPostal
+            // structuredPostal.put(CommonDataKinds.StructuredPostal.???,
+            // postalAddressesState[i]);
             contactData.add(structuredPostal);
         }
 
-        for (int i = 0; i < numOfIMAddresses; i++)
-        {
+        for (int i = 0; i < numOfIMAddresses; i++) {
             ContentValues imAddress = new ContentValues();
             imAddress.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.Im.CONTENT_ITEM_TYPE);
             imAddress.put(CommonDataKinds.Im.DATA, imAccounts[i]);
@@ -474,22 +481,22 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             contactData.add(imAddress);
         }
 
-        if(note != null) {
+        if (note != null) {
             ContentValues structuredNote = new ContentValues();
             structuredNote.put(ContactsContract.Data.MIMETYPE, Note.CONTENT_ITEM_TYPE);
             structuredNote.put(ContactsContract.CommonDataKinds.Note.NOTE, note);
             contactData.add(structuredNote);
         }
 
-        if(thumbnailPath != null && !thumbnailPath.isEmpty()) {
+        if (thumbnailPath != null && !thumbnailPath.isEmpty()) {
             Bitmap photo = getThumbnailBitmap(thumbnailPath);
 
-            if(photo != null) {
+            if (photo != null) {
                 ContentValues thumbnail = new ContentValues();
                 thumbnail.put(ContactsContract.Data.RAW_CONTACT_ID, 0);
                 thumbnail.put(ContactsContract.Data.IS_SUPER_PRIMARY, 1);
                 thumbnail.put(ContactsContract.CommonDataKinds.Photo.PHOTO, toByteArray(photo));
-                thumbnail.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE );
+                thumbnail.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE);
                 contactData.add(thumbnail);
             }
         }
@@ -525,7 +532,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
         }
     }
 
- /*
+    /*
      * View contact in native app
      */
     @ReactMethod
@@ -546,7 +553,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             promise.reject(e.toString());
         }
     }
-    
+
     /*
      * Edit contact in native app
      */
@@ -708,7 +715,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
                 .withValue(Organization.DEPARTMENT, department);
         ops.add(op.build());
 
-        //TODO not sure where to allow yields
+        // TODO not sure where to allow yields
         op.withYieldAllowed(true);
 
         for (int i = 0; i < numOfPhones; i++) {
@@ -739,13 +746,14 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             ops.add(op.build());
         }
 
-        if(thumbnailPath != null && !thumbnailPath.isEmpty()) {
+        if (thumbnailPath != null && !thumbnailPath.isEmpty()) {
             Bitmap photo = getThumbnailBitmap(thumbnailPath);
 
-            if(photo != null) {
+            if (photo != null) {
                 ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
                         .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
-                        .withValue(ContactsContract.Data.MIMETYPE,ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE)
+                        .withValue(ContactsContract.Data.MIMETYPE,
+                                ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE)
                         .withValue(ContactsContract.CommonDataKinds.Photo.PHOTO, toByteArray(photo))
                         .build());
             }
@@ -759,7 +767,8 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
                 op = ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
                         .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
                         .withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)
-                        .withValue(CommonDataKinds.StructuredPostal.TYPE, mapStringToPostalAddressType(address.getString("label")))
+                        .withValue(CommonDataKinds.StructuredPostal.TYPE,
+                                mapStringToPostalAddressType(address.getString("label")))
                         .withValue(CommonDataKinds.StructuredPostal.LABEL, address.getString("label"))
                         .withValue(CommonDataKinds.StructuredPostal.STREET, address.getString("street"))
                         .withValue(CommonDataKinds.StructuredPostal.CITY, address.getString("city"))
@@ -771,8 +780,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             }
         }
 
-        for (int i = 0; i < numOfIMAddresses; i++)
-        {
+        for (int i = 0; i < numOfIMAddresses; i++) {
             op = ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
                     .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
                     .withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Im.CONTENT_ITEM_TYPE)
@@ -788,7 +796,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             ContentResolver cr = ctx.getContentResolver();
             ContentProviderResult[] result = cr.applyBatch(ContactsContract.AUTHORITY, ops);
 
-            if(result != null && result.length > 0) {
+            if (result != null && result.length > 0) {
 
                 String rawId = String.valueOf(ContentUris.parseId(result[0].uri));
 
@@ -919,9 +927,9 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             for (int i = 0; i < numOfPostalAddresses; i++) {
                 String postalLabel = getValueFromKey(postalAddresses.getMap(i), "label");
                 postalAddressesStreet[i] = getValueFromKey(postalAddresses.getMap(i), "street");
-                postalAddressesCity[i] =  getValueFromKey(postalAddresses.getMap(i), "city");
+                postalAddressesCity[i] = getValueFromKey(postalAddresses.getMap(i), "city");
                 postalAddressesState[i] = getValueFromKey(postalAddresses.getMap(i), "state");
-                postalAddressesRegion[i] = getValueFromKey(postalAddresses.getMap(i),"region");
+                postalAddressesRegion[i] = getValueFromKey(postalAddresses.getMap(i), "region");
                 postalAddressesPostCode[i] = getValueFromKey(postalAddresses.getMap(i), "postCode");
                 postalAddressesCountry[i] = getValueFromKey(postalAddresses.getMap(i), "country");
                 postalAddressesType[i] = mapStringToPostalAddressType(postalLabel);
@@ -951,7 +959,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
         ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
 
         ContentProviderOperation.Builder op = ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                .withSelection(ContactsContract.Data.CONTACT_ID + "=?", new String[]{String.valueOf(recordID)})
+                .withSelection(ContactsContract.Data.CONTACT_ID + "=?", new String[] { String.valueOf(recordID) })
                 .withValue(ContactsContract.Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE)
                 .withValue(StructuredName.GIVEN_NAME, givenName)
                 .withValue(StructuredName.MIDDLE_NAME, middleName)
@@ -961,7 +969,8 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
         ops.add(op.build());
 
         op = ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + " = ?", new String[]{String.valueOf(recordID), Organization.CONTENT_ITEM_TYPE})
+                .withSelection(ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + " = ?",
+                        new String[] { String.valueOf(recordID), Organization.CONTENT_ITEM_TYPE })
                 .withValue(Organization.COMPANY, company)
                 .withValue(Organization.TITLE, jobTitle)
                 .withValue(Organization.DEPARTMENT, department);
@@ -969,14 +978,13 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
 
         op.withYieldAllowed(true);
 
-
         if (phoneNumbers != null) {
             // remove existing phoneNumbers first
             op = ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
                     .withSelection(
-                        ContactsContract.Data.MIMETYPE  + "=? AND "+ ContactsContract.Data.RAW_CONTACT_ID + " = ?",
-                        new String[]{String.valueOf(CommonDataKinds.Phone.CONTENT_ITEM_TYPE), String.valueOf(rawContactId)}
-                    );
+                            ContactsContract.Data.MIMETYPE + "=? AND " + ContactsContract.Data.RAW_CONTACT_ID + " = ?",
+                            new String[] { String.valueOf(CommonDataKinds.Phone.CONTENT_ITEM_TYPE),
+                                    String.valueOf(rawContactId) });
             ops.add(op.build());
 
             // add passed phonenumbers
@@ -999,19 +1007,19 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
                         .withValue(CommonDataKinds.Website.URL, urls[i]);
             } else {
                 op = ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                        .withSelection(ContactsContract.Data._ID + "=?", new String[]{String.valueOf(urlIds[i])})
+                        .withSelection(ContactsContract.Data._ID + "=?", new String[] { String.valueOf(urlIds[i]) })
                         .withValue(CommonDataKinds.Website.URL, urls[i]);
             }
             ops.add(op.build());
         }
 
-        if (emailAddresses != null){
+        if (emailAddresses != null) {
             // remove existing emails first
             op = ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
                     .withSelection(
-                        ContactsContract.Data.MIMETYPE  + "=? AND "+ ContactsContract.Data.RAW_CONTACT_ID + " = ?",
-                        new String[]{String.valueOf(CommonDataKinds.Email.CONTENT_ITEM_TYPE), String.valueOf(rawContactId)}
-                    );
+                            ContactsContract.Data.MIMETYPE + "=? AND " + ContactsContract.Data.RAW_CONTACT_ID + " = ?",
+                            new String[] { String.valueOf(CommonDataKinds.Email.CONTENT_ITEM_TYPE),
+                                    String.valueOf(rawContactId) });
             ops.add(op.build());
 
             // add passed email addresses
@@ -1029,12 +1037,11 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
         // remove existing note first
         op = ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
                 .withSelection(
-                        ContactsContract.Data.MIMETYPE  + "=? AND "+ ContactsContract.Data.RAW_CONTACT_ID + " = ?",
-                        new String[]{String.valueOf(Note.CONTENT_ITEM_TYPE), String.valueOf(rawContactId)}
-                );
+                        ContactsContract.Data.MIMETYPE + "=? AND " + ContactsContract.Data.RAW_CONTACT_ID + " = ?",
+                        new String[] { String.valueOf(Note.CONTENT_ITEM_TYPE), String.valueOf(rawContactId) });
         ops.add(op.build());
 
-        if(note != null) {
+        if (note != null) {
             op = ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
                     .withValue(ContactsContract.Data.RAW_CONTACT_ID, String.valueOf(rawContactId))
                     .withValue(ContactsContract.Data.MIMETYPE, Note.CONTENT_ITEM_TYPE)
@@ -1042,25 +1049,26 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             ops.add(op.build());
         }
 
-        if(thumbnailPath != null && !thumbnailPath.isEmpty()) {
+        if (thumbnailPath != null && !thumbnailPath.isEmpty()) {
             Bitmap photo = getThumbnailBitmap(thumbnailPath);
 
-            if(photo != null) {
+            if (photo != null) {
                 ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
                         .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
-                        .withValue(ContactsContract.Data.MIMETYPE,ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE)
+                        .withValue(ContactsContract.Data.MIMETYPE,
+                                ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE)
                         .withValue(ContactsContract.CommonDataKinds.Photo.PHOTO, toByteArray(photo))
                         .build());
             }
         }
 
-        if (postalAddresses != null){
-            //remove existing addresses
-             op = ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
+        if (postalAddresses != null) {
+            // remove existing addresses
+            op = ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
                     .withSelection(
-                        ContactsContract.Data.MIMETYPE  + "=? AND "+ ContactsContract.Data.RAW_CONTACT_ID + " = ?",
-                        new String[]{String.valueOf(CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE), String.valueOf(rawContactId)}
-                    );
+                            ContactsContract.Data.MIMETYPE + "=? AND " + ContactsContract.Data.RAW_CONTACT_ID + " = ?",
+                            new String[] { String.valueOf(CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE),
+                                    String.valueOf(rawContactId) });
             ops.add(op.build());
 
             for (int i = 0; i < numOfPostalAddresses; i++) {
@@ -1078,13 +1086,13 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             }
         }
 
-        if (imAddresses != null){
+        if (imAddresses != null) {
             // remove existing IM addresses
             op = ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
                     .withSelection(
-                            ContactsContract.Data.MIMETYPE  + "=? AND "+ ContactsContract.Data.RAW_CONTACT_ID + " = ?",
-                            new String[]{String.valueOf(CommonDataKinds.Im.CONTENT_ITEM_TYPE), String.valueOf(rawContactId)}
-                    );
+                            ContactsContract.Data.MIMETYPE + "=? AND " + ContactsContract.Data.RAW_CONTACT_ID + " = ?",
+                            new String[] { String.valueOf(CommonDataKinds.Im.CONTENT_ITEM_TYPE),
+                                    String.valueOf(rawContactId) });
             ops.add(op.build());
 
             // add passed IM addresses
@@ -1105,7 +1113,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             ContentResolver cr = ctx.getContentResolver();
             ContentProviderResult[] result = cr.applyBatch(ContactsContract.AUTHORITY, ops);
 
-            if(result != null && result.length > 0) {
+            if (result != null && result.length > 0) {
 
                 ContactsProvider contactsProvider = new ContactsProvider(cr);
                 WritableMap updatedContact = contactsProvider.getContactById(recordID);
@@ -1126,21 +1134,22 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
         String recordID = contact.hasKey("recordID") ? contact.getString("recordID") : null;
 
         try {
-               Context ctx = getReactApplicationContext();
+            Context ctx = getReactApplicationContext();
 
-               Uri uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI,recordID);
-               ContentResolver cr = ctx.getContentResolver();
-               int deleted = cr.delete(uri,null,null);
+            Uri uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, recordID);
+            ContentResolver cr = ctx.getContentResolver();
+            int deleted = cr.delete(uri, null, null);
 
-               if(deleted > 0)
-                 promise.resolve(recordID); // success
-               else
-                 promise.resolve(null); // something was wrong
+            if (deleted > 0)
+                promise.resolve(recordID); // success
+            else
+                promise.resolve(null); // something was wrong
 
         } catch (Exception e) {
             promise.reject(e.toString());
         }
     }
+
     /*
      * Check permission
      */
@@ -1178,11 +1187,12 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
         }
 
         requestPromise = promise;
-        ActivityCompat.requestPermissions(currentActivity, new String[]{PERMISSION_READ_CONTACTS}, PERMISSION_REQUEST_CODE);
+        ActivityCompat.requestPermissions(currentActivity, new String[] { PERMISSION_READ_CONTACTS },
+                PERMISSION_REQUEST_CODE);
     }
 
     protected static void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
-                                                     @NonNull int[] grantResults) {
+            @NonNull int[] grantResults) {
         if (requestPromise == null) {
             return;
         }
@@ -1218,13 +1228,14 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
      */
     private String isPermissionGranted() {
         // return -1 for denied and 1
-        int res = getReactApplicationContext().checkSelfPermission(PERMISSION_READ_CONTACTS);
+        int res = ActivityCompat.checkSelfPermission(getReactApplicationContext(), PERMISSION_READ_CONTACTS);
         return (res == PackageManager.PERMISSION_GRANTED) ? PERMISSION_AUTHORIZED : PERMISSION_DENIED;
     }
 
     /*
      * TODO support all phone types
-     * http://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Phone.html
+     * http://developer.android.com/reference/android/provider/ContactsContract.
+     * CommonDataKinds.Phone.html
      */
     private int mapStringToPhoneType(String label) {
         int phoneType;
@@ -1271,7 +1282,8 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
 
     /*
      * TODO support TYPE_CUSTOM
-     * http://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Email.html
+     * http://developer.android.com/reference/android/provider/ContactsContract.
+     * CommonDataKinds.Email.html
      */
     private int mapStringToEmailType(String label) {
         int emailType;
@@ -1316,7 +1328,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
 
     @Override
     public String getName() {
-        return "Contacts";
+        return ContactsProvider.NAME;
     }
 
     /*

package/index.d.ts

@@ -4,7 +4,7 @@ export function getContactById(contactId: string): Promise<Contact | null>;
 export function getCount(): Promise<number>;
 export function getPhotoForId(contactId: string): Promise<string>;
 export function addContact(contact: Partial<Contact>): Promise<Contact>;
-export function openContactForm(contact: Partial<Contact>): Promise<Contact>;
+export function openContactForm(contact: Partial<Contact>): Promise<Contact | null>;
 export function openExistingContact(contact: Contact): Promise<Contact>;
 export function viewExistingContact(contact: { recordID: string }): Promise<Contact | void>
 export function editExistingContact(contact: Contact): Promise<Contact>;
@@ -49,7 +49,7 @@ export interface InstantMessageAddress {
 export interface Birthday {
     day: number;
     month: number;
-    year: number;
+    year?: number;
 }
 
 export interface UrlAddress {
@@ -62,21 +62,21 @@ export interface Contact {
     backTitle: string;
     company: string|null;
     emailAddresses: EmailAddress[];
-    displayName: string;
+    displayName: string|null;
     familyName: string;
-    givenName: string;
+    givenName: string|null;
     middleName: string;
-    jobTitle: string;
+    jobTitle: string|null;
     phoneNumbers: PhoneNumber[];
     hasThumbnail: boolean;
     thumbnailPath: string;
     isStarred: boolean;
     postalAddresses: PostalAddress[];
-    prefix: string;
-    suffix: string;
-    department: string;
-    birthday: Birthday;
+    prefix: string|null;
+    suffix: string|null;
+    department: string|null;
+    birthday?: Birthday;
     imAddresses: InstantMessageAddress[];
     urlAddresses: UrlAddress[];
-    note: string;
+    note: string|null;
 }