react-native-contacts 7.0.0 → 7.0.4

package/README.md

@@ -29,10 +29,14 @@ PermissionsAndroid.request(
     'buttonPositive': 'Please accept bare mortal'
   }
 )
-.then(Contacts.getAll)
-.then(contacts => {
-  ...
-})
+  .then(Contacts.getAll()
+    .then((contacts) => {
+        // work with contacts
+          console.log(contacts)
+        })
+          .catch((e) => {
+              console.log(e)
+          }))
 ```
 
 ## Installation
@@ -49,8 +53,14 @@ npm install react-native-contacts --save
 ```
 yarn add react-native-contacts
 ```
-
-### react native version 60 and above
+## You no longer need to include the pod line in the PodFile since V7.0.0+, we now support autolinking!
+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!
+```
+### react native version 60 and above 
 
 If you are using react native version 0.60 or above you do not have to link this library.
 
@@ -134,10 +144,10 @@ The `READ_CONTACTS` permission must be added to your main application's `Android
 ```
 
 ##### API 22 and below
-Add `READ_CONTACTS` and/or `WRITE_PROFILE` permissions to `AndroidManifest.xml`
+Add `READ_PROFILE` and/or `WRITE_PROFILE` permissions to `AndroidManifest.xml`
 ```xml
 ...
-<uses-permission android:name="android.permission.READ_CONTACTS" />
+<uses-permission android:name="android.permission.READ_PROFILE" />
 ...
 ```
 
@@ -169,7 +179,8 @@ If you'd like to read/write the contact's notes, call the `iosEnableNotesUsage(t
  * `getPhotoForId(contactId)`: Promise<string> - returns a URI (or null) for a contacts photo
  * `addContact(contact)`: Promise<Contact> - adds a contact to the AddressBook.  
  * `openContactForm(contact)` - create a new contact and display in contactsUI. 
- * `openExistingContact(contact)` - where contact is an object with a valid recordID
+ * `openExistingContact(contact)` - open existing contact (edit mode), where contact is an object with a valid recordID
+ * `viewExistingContact(contact)` - open existing contact (view mode), where contact is an object with a valid recordID
  * `editExistingContact(contact)`: Promise<Contact> - add numbers to the contact, where the contact is an object with a valid recordID and an array of phoneNumbers
  * `updateContact(contact)`: Promise<Contact> - where contact is an object with a valid recordID  
  * `deleteContact(contact)` - where contact is an object with a valid recordID  
@@ -215,7 +226,7 @@ If you'd like to read/write the contact's notes, call the `iosEnableNotesUsage(t
   prefix: 'MR',
   suffix: '',
   department: '',
-  birthday: {'year': 1988, 'month': 0, 'day': 1 },
+  birthday: {'year': 1988, 'month': 1, 'day': 1 },
   imAddresses: [
     { username: '0123456789', service: 'ICQ'},
     { username: 'johndoe123', service: 'Facebook'}

package/android/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     repositories {
+        mavenCentral()
         google()
-        jcenter()
     }
 
     dependencies {

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

@@ -308,15 +308,18 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
         ReadableArray phoneNumbers = contact.hasKey("phoneNumbers") ? contact.getArray("phoneNumbers") : null;
         int numOfPhones = 0;
         String[] phones = null;
-        Integer[] phonesLabels = null;
+        String[] phonesLabels = null;
+        Integer[] phonesLabelsTypes = null;
         if (phoneNumbers != null) {
             numOfPhones = phoneNumbers.size();
             phones = new String[numOfPhones];
-            phonesLabels = new Integer[numOfPhones];
+            phonesLabels = new String[numOfPhones];
+            phonesLabelsTypes = new Integer[numOfPhones];
             for (int i = 0; i < numOfPhones; i++) {
                 phones[i] = phoneNumbers.getMap(i).getString("number");
                 String label = phoneNumbers.getMap(i).getString("label");
-                phonesLabels[i] = mapStringToPhoneType(label);
+                phonesLabels[i] = label;
+                phonesLabelsTypes[i] = mapStringToPhoneType(label);
             }
         }
 
@@ -432,8 +435,10 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
         for (int i = 0; i < numOfPhones; i++) {
             ContentValues phone = new ContentValues();
             phone.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
-            phone.put(CommonDataKinds.Phone.TYPE, phonesLabels[i]);
+            phone.put(CommonDataKinds.Phone.TYPE, phonesLabelsTypes[i]);
+            phone.put(CommonDataKinds.Phone.LABEL, phonesLabels[i]);
             phone.put(CommonDataKinds.Phone.NUMBER, phones[i]);
+
             contactData.add(phone);
         }
 
@@ -514,6 +519,28 @@ public class ContactsManager extends ReactContextBaseJavaModule implements Activ
             promise.reject(e.toString());
         }
     }
+
+ /*
+     * View contact in native app
+     */
+    @ReactMethod
+    public void viewExistingContact(ReadableMap contact, Promise promise) {
+
+        String recordID = contact.hasKey("recordID") ? contact.getString("recordID") : null;
+
+        try {
+            Uri uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, recordID);
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setDataAndType(uri, ContactsContract.Contacts.CONTENT_ITEM_TYPE);
+            intent.putExtra("finishActivityOnSaveCompleted", true);
+
+            updateContactPromise = promise;
+            getReactApplicationContext().startActivityForResult(intent, REQUEST_OPEN_EXISTING_CONTACT, Bundle.EMPTY);
+
+        } catch (Exception e) {
+            promise.reject(e.toString());
+        }
+    }
     
     /*
      * Edit contact in native app

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

@@ -551,6 +551,9 @@ public class ContactsProvider {
                         }
                     }
                     break;
+                case Note.CONTENT_ITEM_TYPE:
+                    contact.note = cursor.getString(cursor.getColumnIndex(Note.NOTE));
+                    break;
             }
         }
 

package/foo.js

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

package/index.d.ts

@@ -6,6 +6,7 @@ export function getPhotoForId(contactId: string): Promise<string>;
 export function addContact(contact: Contact): Promise<void>;
 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 deleteContact(contact: Contact): Promise<void>;
@@ -54,7 +55,7 @@ export interface Birthday {
 export interface Contact {
     recordID: string;
     backTitle: string;
-    company: string;
+    company: string|null;
     emailAddresses: EmailAddress[];
     displayName: string;
     familyName: string;

package/ios/RCTContacts/RCTContacts.m

@@ -347,9 +347,9 @@ RCT_EXPORT_METHOD(getCount:(RCTPromiseResolveBlock) resolve rejecter:(RCTPromise
         if (birthday.month != NSDateComponentUndefined && birthday.day != NSDateComponentUndefined) {
             //months are indexed to 0 in JavaScript (0 = January) so we subtract 1 from NSDateComponents.month
             if (birthday.year != NSDateComponentUndefined) {
-                [output setObject:@{@"year": @(birthday.year), @"month": @(birthday.month - 1), @"day": @(birthday.day)} forKey:@"birthday"];
+                [output setObject:@{@"year": @(birthday.year), @"month": @(birthday.month), @"day": @(birthday.day)} forKey:@"birthday"];
             } else {
-                [output setObject:@{@"month": @(birthday.month - 1), @"day":@(birthday.day)} forKey:@"birthday"];
+                [output setObject:@{@"month": @(birthday.month), @"day":@(birthday.day)} forKey:@"birthday"];
             }
         }
     }
@@ -676,18 +676,8 @@ RCT_EXPORT_METHOD(openContactForm:(NSDictionary *)contactData
                 viewController = viewController.presentedViewController;
             }
         [viewController presentViewController:navigation animated:YES completion:nil];
-        
-        if (@available(iOS 13, *)) {
-            viewController.view.window.backgroundColor=[UIColor blackColor];
-            navigation.navigationBar.topItem.title = @"";
-            UIView *statusBar = [[UIView alloc]initWithFrame:[UIApplication sharedApplication].keyWindow.windowScene.statusBarManager.statusBarFrame];
-            statusBar.backgroundColor = [UIColor blackColor];
-            statusBar.tag=1;
-            controller.navigationController.navigationBar.tintColor = [UIColor blackColor];
-            [[UIApplication sharedApplication].keyWindow addSubview:statusBar];
-        }
 
-        updateContactPromise = resolve;
+        self->updateContactPromise = resolve;
     });
 }
 
@@ -716,7 +706,7 @@ RCT_EXPORT_METHOD(openExistingContact:(NSDictionary *)contactData resolver:(RCTP
         CNContactViewController *contactViewController = [CNContactViewController viewControllerForContact:contact];
 
         // Add a cancel button which will close the view
-        contactViewController.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:backTitle == nil ? @"Cancel" : backTitle style:UIBarButtonSystemItemCancel target:self action:@selector(cancelContactForm)];
+        contactViewController.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:backTitle == nil ? @"Cancel" : backTitle style:UIBarButtonItemStyleDone target:self action:@selector(cancelContactForm)];
         contactViewController.delegate = self;
 
 
@@ -777,6 +767,56 @@ RCT_EXPORT_METHOD(openExistingContact:(NSDictionary *)contactData resolver:(RCTP
     }
 }
 
+RCT_EXPORT_METHOD(viewExistingContact:(NSDictionary *)contactData resolver:(RCTPromiseResolveBlock) resolve
+    rejecter:(RCTPromiseRejectBlock) reject)
+{
+    if(!contactStore) {
+        contactStore = [[CNContactStore alloc] init];
+    }
+
+    NSString* recordID = [contactData valueForKey:@"recordID"];
+    NSString* backTitle = [contactData valueForKey:@"backTitle"];
+
+    NSArray *keys = @[CNContactIdentifierKey,
+                      CNContactEmailAddressesKey,
+                      CNContactBirthdayKey,
+                      CNContactImageDataKey,
+                      CNContactPhoneNumbersKey,
+                      [CNContactFormatter descriptorForRequiredKeysForStyle:CNContactFormatterStyleFullName],
+                      [CNContactViewController descriptorForRequiredKeys]];
+
+    @try {
+
+        CNContact *contact = [contactStore unifiedContactWithIdentifier:recordID keysToFetch:keys error:nil];
+
+        CNContactViewController *contactViewController = [CNContactViewController viewControllerForContact:contact];
+
+        // Add a cancel button which will close the view
+        contactViewController.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:backTitle == nil ? @"Cancel" : backTitle style:UIBarButtonSystemItemCancel target:self action:@selector(cancelContactForm)];
+        contactViewController.delegate = self;
+
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            UINavigationController* navigation = [[UINavigationController alloc] initWithRootViewController:contactViewController];
+
+            UIViewController *currentViewController = [UIApplication sharedApplication].keyWindow.rootViewController;
+
+            while (currentViewController.presentedViewController)
+            {
+                currentViewController = currentViewController.presentedViewController;
+            }
+
+            [currentViewController presentViewController:navigation animated:YES completion:nil];
+
+            updateContactPromise = resolve;
+        });
+
+    }
+    @catch (NSException *exception) {
+        reject(@"Error", [exception reason], nil);
+    }
+}
+
 RCT_EXPORT_METHOD(editExistingContact:(NSDictionary *)contactData resolver:(RCTPromiseResolveBlock) resolve
     rejecter:(RCTPromiseRejectBlock) reject)
 {
@@ -860,17 +900,7 @@ RCT_EXPORT_METHOD(editExistingContact:(NSDictionary *)contactData resolver:(RCTP
             [viewController presentViewController:navigation animated:YES completion:nil];
             [controller presentViewController:alert animated:YES completion:nil];
 
-            if (@available(iOS 13, *)) {
-                viewController.view.window.backgroundColor=[UIColor blackColor];
-                navigation.navigationBar.topItem.title = @"";
-                UIView *statusBar = [[UIView alloc]initWithFrame:[UIApplication sharedApplication].keyWindow.windowScene.statusBarManager.statusBarFrame];
-                statusBar.backgroundColor = [UIColor blackColor];
-                statusBar.tag=1;
-                controller.navigationController.navigationBar.tintColor = [UIColor blackColor];
-                [[UIApplication sharedApplication].keyWindow addSubview:statusBar];
-            }
-
-            updateContactPromise = resolve;
+            self->updateContactPromise = resolve;
         });
         
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -903,6 +933,10 @@ RCT_EXPORT_METHOD(editExistingContact:(NSDictionary *)contactData resolver:(RCTP
 {
     if (updateContactPromise != nil) {
         UIViewController *rootViewController = (UIViewController*)[[[[UIApplication sharedApplication] delegate] window] rootViewController];
+        while (rootViewController.presentedViewController)
+            {
+                rootViewController = rootViewController.presentedViewController;
+            }
         [rootViewController dismissViewControllerAnimated:YES completion:nil];
 
         updateContactPromise(nil);
@@ -925,12 +959,6 @@ RCT_EXPORT_METHOD(editExistingContact:(NSDictionary *)contactData resolver:(RCTP
 
         updateContactPromise = nil;
     }
-    
-    UIView *statusBar = [[UIApplication sharedApplication].keyWindow viewWithTag:1];
-    
-    if(statusBar) {
-        [statusBar removeFromSuperview];
-    }
 }
 
 RCT_EXPORT_METHOD(updateContact:(NSDictionary *)contactData resolver:(RCTPromiseResolveBlock) resolve
@@ -1011,8 +1039,7 @@ RCT_EXPORT_METHOD(updateContact:(NSDictionary *)contactData resolver:(RCTPromise
             if (birthday[@"year"]) {
                 components.year = [birthday[@"year"] intValue];
             }
-            //months are indexed to 0 in JavaScript so we add 1 when assigning the month to DateComponent
-            components.month = [birthday[@"month"] intValue] + 1;
+            components.month = [birthday[@"month"] intValue];
             components.day = [birthday[@"day"] intValue];
         }
 

package/package.json

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