react-native-contacts 7.0.5 → 7.0.7

package/.tool-versions

@@ -0,0 +1 @@
+nodejs 19.2.0

package/README.md

@@ -21,22 +21,25 @@ On android you must request permissions beforehand
 import { PermissionsAndroid } from 'react-native';
 import Contacts from 'react-native-contacts';
 
-PermissionsAndroid.request(
-  PermissionsAndroid.PERMISSIONS.READ_CONTACTS,
-  {
-    'title': 'Contacts',
-    'message': 'This app would like to view your contacts.',
-    'buttonPositive': 'Please accept bare mortal'
-  }
-)
-  .then(Contacts.getAll()
-    .then((contacts) => {
-        // work with contacts
-          console.log(contacts)
+PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.READ_CONTACTS, {
+        title: 'Contacts',
+        message: 'This app would like to view your contacts.',
+        buttonPositive: 'Please accept bare mortal',
+    })
+        .then((res) => {
+            console.log('Permission: ', res);
+            Contacts.getAll()
+                .then((contacts) => {
+                    // work with contacts
+                    console.log(contacts);
+                })
+                .catch((e) => {
+                    console.log(e);
+                });
         })
-          .catch((e) => {
-              console.log(e)
-          }))
+        .catch((error) => {
+            console.error('Permission error: ', error);
+        });
 ```
 
 ## Installation
@@ -58,7 +61,7 @@ If you were previously using manually linking follow these steps to upgrade
 ```
 react-native unlink react-native-contacts
 npm install latest version of react-native-contacts
-Your good to go!
+You're good to go!
 ```
 ### react native version 60 and above
 

package/android/src/main/java/com/rt2zz/reactnativecontacts/ContactsManager.java

@@ -1218,7 +1218,7 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
      */
     private String isPermissionGranted() {
         // return -1 for denied and 1
-        int res = getReactApplicationContext().checkCallingOrSelfPermission(PERMISSION_READ_CONTACTS);
+        int res = getReactApplicationContext().checkSelfPermission(PERMISSION_READ_CONTACTS);
         return (res == PackageManager.PERMISSION_GRANTED) ? PERMISSION_AUTHORIZED : PERMISSION_DENIED;
     }
 

package/android/src/main/java/com/rt2zz/reactnativecontacts/ContactsProvider.java

@@ -185,7 +185,7 @@ public class ContactsProvider {
             /*contact id not found */
         }
 
-        if (rawCursor.moveToNext()) {
+        if (cursorMoveToNext(rawCursor)) {
             int columnIndex;
             columnIndex = rawCursor.getColumnIndex(ContactsContract.RawContacts.CONTACT_ID);
             if (columnIndex == -1) {
@@ -304,12 +304,20 @@ public class ContactsProvider {
         return contacts;
     }
 
+    private Boolean cursorMoveToNext(Cursor cursor) {
+        try {
+            return cursor.moveToNext();
+        } catch(RuntimeException error) {
+            return false;
+        }
+    }
+
     @NonNull
     private Map<String, Contact> loadContactsFrom(Cursor cursor) {
 
         Map<String, Contact> map = new LinkedHashMap<>();
 
-        while (cursor != null && cursor.moveToNext()) {
+        while (cursor != null && cursorMoveToNext(cursor)) {
 
             int columnIndexContactId = cursor.getColumnIndex(ContactsContract.Data.CONTACT_ID);
             int columnIndexId = cursor.getColumnIndex(ContactsContract.Data._ID);
@@ -573,7 +581,7 @@ public class ContactsProvider {
                 null
         );
         try {
-            if (cursor != null && cursor.moveToNext()) {
+            if (cursor != null && cursorMoveToNext(cursor)) {
                 String rawPhotoURI = cursor.getString(cursor.getColumnIndex(Contactables.PHOTO_URI));
                 if (!TextUtils.isEmpty(rawPhotoURI)) {
                     return rawPhotoURI;

package/index.d.ts

@@ -1,14 +1,14 @@
 export function getAll(): Promise<Contact[]>;
 export function getAllWithoutPhotos(): Promise<Contact[]>;
-export function getContactById(contactId: string): Promise<Contact>;
+export function getContactById(contactId: string): Promise<Contact | null>;
 export function getCount(): Promise<number>;
 export function getPhotoForId(contactId: string): Promise<string>;
-export function addContact(contact: Contact): Promise<void>;
+export function addContact(contact: Partial<Contact>): Promise<Contact>;
 export function openContactForm(contact: Partial<Contact>): Promise<Contact>;
 export function openExistingContact(contact: Contact): Promise<Contact>;
 export function viewExistingContact(contact: { recordID: string }): Promise<Contact | void>
 export function editExistingContact(contact: Contact): Promise<Contact>;
-export function updateContact(contact: Contact): Promise<void>;
+export function updateContact(contact: Partial<Contact> & {recordID: string}): Promise<void>;
 export function deleteContact(contact: Contact): Promise<void>;
 export function getContactsMatchingString(str: string): Promise<Contact[]>;
 export function getContactsByPhoneNumber(phoneNumber: string): Promise<Contact[]>;
@@ -52,6 +52,11 @@ export interface Birthday {
     year: number;
 }
 
+export interface UrlAddress {
+    url: string;
+    label: string;
+}
+
 export interface Contact {
     recordID: string;
     backTitle: string;
@@ -71,6 +76,7 @@ export interface Contact {
     suffix: string;
     department: string;
     birthday: Birthday;
-    imAddresses: InstantMessageAddress[]
+    imAddresses: InstantMessageAddress[];
+    urlAddresses: UrlAddress[];
     note: string;
 }

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/rt2zz/react-native-contacts.git"
   },
-  "version": "7.0.5",
+  "version": "7.0.7",
   "description": "React Native Contacts (android & ios)",
   "nativePackage": true,
   "keywords": [

package/foo.js

@@ -1 +0,0 @@
-console.log('hello')