Merge pull request #5 from byrdsandbytes/develop

Refactor and bump up to v.1.1.0
byrdsandbytes · Jun 10, 2020 · a62b76c · a62b76c
2 parents d291f41 + 57f2419
commit a62b76c
Show file tree

Hide file tree

Showing 19 changed files with 100 additions and 175 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,12 +17,19 @@ $RECYCLE.BIN/
 log.txt
 npm-debug.log*
 
+android/build
+android/.gradle
+android/.settings
+android/.classpath
+android/.project
+
 /.idea
 /.ionic
 /.sass-cache
 /.sourcemaps
 /.versions
 /.vscode
+/build/
 /coverage
 /dist
 /node_modules

diff --git a/android/src/main/java/ch/byrds/capacitorcontacts/CapContacts.java b/android/src/main/java/ch/byrds/capacitorcontacts/CapContacts.java
@@ -26,7 +26,6 @@ public class CapContacts extends Plugin {
     public static final String CONTACT_ID = "contactId";
     public static final String EMAILS = "emails";
     public static final String PHONE_NUMBERS = "phoneNumbers";
-    public static final String LOOKUP_KEY = "lookupKey";
     public static final String DISPLAY_NAME = "displayName";
     public static final String ORGANIZATION_NAME = "organizationName";
     public static final String ORGANIZATION_ROLE = "organizationRole";
@@ -38,6 +37,7 @@ public void getPermissions(PluginCall call) {
             requestPermissions(call);
         } else {
             JSObject result = new JSObject();
+            result.put("granted", true);
             call.success(result);
         }
     }
@@ -47,10 +47,14 @@ protected void handleRequestPermissionsResult(int requestCode, String[] permissi
         super.handleRequestPermissionsResult(requestCode, permissions, grantResults);
 
         PluginCall savedCall = getSavedCall();
+        JSObject result = new JSObject();
+
         if (!hasRequiredPermissions()) {
-            savedCall.error("Permissions not granted.");
+            result.put("granted", false);
+            savedCall.success(result);
         } else {
-            savedCall.success();
+            result.put("granted", true);
+            savedCall.success(result);
         }
     }
 
@@ -67,7 +71,6 @@ public void getContacts(PluginCall call) {
             JSObject jsContact = new JSObject();
             String contactId = dataCursor.getString(dataCursor.getColumnIndex(ContactsContract.Contacts._ID));
             jsContact.put(CONTACT_ID, contactId);
-            jsContact.put(LOOKUP_KEY, dataCursor.getString(dataCursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY)));
             jsContact.put(DISPLAY_NAME, dataCursor.getString(dataCursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME_PRIMARY)));
 
             addOrganization(jsContact);
@@ -223,7 +226,7 @@ private void addPhoneNumbers(JSObject jsContact) {
 
     @PluginMethod()
     public void deleteContact(PluginCall call) {
-        Uri uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, call.getString(LOOKUP_KEY));
+        Uri uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, call.getString(CONTACT_ID));
         getContext().getContentResolver().delete(uri, null, null);
 
         JSObject result = new JSObject();

diff --git a/dist/esm/definitions.d.ts b/dist/esm/definitions.d.ts
diff --git a/dist/esm/definitions.js b/dist/esm/definitions.js
diff --git a/dist/esm/definitions.js.map b/dist/esm/definitions.js.map
diff --git a/dist/esm/index.d.ts b/dist/esm/index.d.ts
diff --git a/dist/esm/index.js b/dist/esm/index.js
diff --git a/dist/esm/index.js.map b/dist/esm/index.js.map
diff --git a/dist/esm/web.d.ts b/dist/esm/web.d.ts
diff --git a/dist/esm/web.js b/dist/esm/web.js
diff --git a/dist/esm/web.js.map b/dist/esm/web.js.map
diff --git a/ios/Plugin/Contacts.swift b/ios/Plugin/Contacts.swift
@@ -10,7 +10,7 @@ import Foundation
 import Contacts
 
 class Contacts {
-    class func getContactFromCNContact() -> [CNContact] {
+    class func getContactFromCNContact() throws -> [CNContact] {
 
         let contactStore = CNContactStore()
         let keysToFetch = [
@@ -24,11 +24,8 @@ class Contacts {
 
         //Get all the containers
         var allContainers: [CNContainer] = []
-        do {
-            allContainers = try contactStore.containers(matching: nil)
-        } catch {
-            print("Error fetching containers")
-        }
+        allContainers = try contactStore.containers(matching: nil)
+
 
         var results: [CNContact] = []
 
@@ -37,13 +34,8 @@ class Contacts {
 
             let fetchPredicate = CNContact.predicateForContactsInContainer(withIdentifier: container.identifier)
 
-            do {
-                let containerResults = try contactStore.unifiedContacts(matching: fetchPredicate, keysToFetch: keysToFetch as! [CNKeyDescriptor])
-                results.append(contentsOf: containerResults)
-
-            } catch {
-                print("Error fetching results for container")
-            }
+            let containerResults = try contactStore.unifiedContacts(matching: fetchPredicate, keysToFetch: keysToFetch as! [CNKeyDescriptor])
+            results.append(contentsOf: containerResults)
         }
 
         return results

diff --git a/ios/Plugin/Permission.swift b/ios/Plugin/Permission.swift
@@ -10,8 +10,7 @@ import Foundation
 import Contacts
 
 class Permissions {
-    // MARK: Contacts
-
+
     class func contactPermission(completionHandler: @escaping (_ accessGranted: Bool) -> Void) {
         let contactStore = CNContactStore()
         switch CNContactStore.authorizationStatus(for: .contacts) {
@@ -31,8 +30,6 @@ class Permissions {
             }
         }
     }
-
-
 }
 
 
diff --git a/ios/Plugin/Plugin.m b/ios/Plugin/Plugin.m
@@ -4,7 +4,6 @@
 // Define the plugin using the CAP_PLUGIN Macro, and
 // each method the plugin supports using the CAP_PLUGIN_METHOD macro.
 CAP_PLUGIN(CapContacts, "CapContacts",
-           CAP_PLUGIN_METHOD(echo, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(checkPermissions, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(getPermissions, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(getContacts, CAPPluginReturnPromise);
 )
diff --git a/ios/Plugin/Plugin.swift b/ios/Plugin/Plugin.swift
@@ -1,6 +1,6 @@
 //
 //  Plugin.swift
-//  
+//
 //
 //  Created by Jonathan Gerber on 15.02.20.
 //  © Byrds & Bytes GmbH - Jonathan Gerber
@@ -11,58 +11,61 @@ import Capacitor
 
 @objc(CapContacts)
 public class CapContacts: CAPPlugin {
-
-    @objc func echo(_ call: CAPPluginCall) {
-        print("Echo was triggered in Swift")
-        let value = call.getString("value") ?? ""
-        call.success([
-            "allowed": value
-        ])
-    }
+
     @objc func getPermissions(_ call: CAPPluginCall) {
         print("checkPermission was triggered in Swift")
-        Permissions.contactPermission { permission in
-            switch permission {
+        Permissions.contactPermission { granted in
+            switch granted {
             case true:
                 call.success([
-                    "allowed": true
+                    "granted": true
                 ])
             default:
                 call.success([
-                    "allowed": false
+                    "granted": false
                 ])
                 }
             }
     }
-    
+
     @objc func getContacts(_ call: CAPPluginCall) {
         var contactsArray : [PluginResultData] = [];
-        let contacts = Contacts.getContactFromCNContact()
-        for contact in contacts {
-            var phoneNumbers: [String] = []
-            var emails: [String] = []
-            for number in contact.phoneNumbers {
-                let numberToAppend = number.value.stringValue
-                phoneNumbers.append(numberToAppend)
-                print(phoneNumbers)
-            }
-            for email in contact.emailAddresses {
-                let emailToAppend = email.value as String
-                emails.append(emailToAppend)
+        Permissions.contactPermission { granted in
+            if granted {
+                do {
+                    let contacts = try Contacts.getContactFromCNContact()
+
+                    for contact in contacts {
+                        var phoneNumbers: [String] = []
+                        var emails: [String] = []
+                        for number in contact.phoneNumbers {
+                            let numberToAppend = number.value.stringValue
+                            phoneNumbers.append(numberToAppend)
+                            print(phoneNumbers)
+                        }
+                        for email in contact.emailAddresses {
+                            let emailToAppend = email.value as String
+                            emails.append(emailToAppend)
+                        }
+                        let contactResult: PluginResultData = [
+                            "contactId": contact.identifier,
+                            "displayName": "\(contact.givenName) \(contact.familyName)",
+                            "phoneNumbers": phoneNumbers,
+                            "emails": emails
+                        ]
+                        contactsArray.append(contactResult)
+                    }
+                    call.success([
+                        "contacts": contactsArray
+                    ])
+                } catch let error as NSError {
+                    call.error("Generic Error", error)
+                }
+            } else {
+                call.error("User denied access to contacts")
             }
-            let contactResult: PluginResultData = [
-                "contactId": contact.identifier,
-                "lookupKey": contact.identifier,
-                "displayName": "\(contact.givenName) \(contact.familyName)",
-                "phoneNumbers": phoneNumbers,
-                "emails": emails
-            ]
-            contactsArray.append(contactResult)    
         }
-        let data : PluginResultData = ["contacts": contactsArray]
-        call.success(data)
-
     }
-    
+
 }
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@byrds/capacitor-contacts",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "A capacitor plugin to fetch contacts",
   "main": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",