Merge pull request #47 from babraham123/typefilter

call-log: Filter by call type, include all possible types

Author: aathapa

Example/App.js

@@ -13,9 +13,10 @@ import CallLogs from 'react-native-call-log';
 
 
 const filter = {
-  phoneNumbers: '+1234567',
+  phoneNumbers: '+11234567890',
   minTimestamp: 1571835032,
   maxTimestamp: 1583318721264,
+  types: 'MISSED',
 }
 
 const instructions = Platform.select({

Example/babel.config.js

@@ -1,3 +1,5 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: [['module:metro-react-native-babel-preset', {
+       unstable_disableES6Transforms: true
+   }]],
 };

Example/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "Example",
+  "name": "example",
   "version": "0.0.1",
   "private": true,
   "scripts": {
@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "16.9.0",
     "react-native": "0.61.5",
-    "react-native-call-log": "^2.1.2"
+    "react-native-call-log": "../"
   },
   "devDependencies": {
     "@babel/core": "^7.6.2",
@@ -21,7 +21,7 @@
     "babel-jest": "^24.9.0",
     "eslint": "^6.5.1",
     "jest": "^24.9.0",
-    "metro-react-native-babel-preset": "^0.56.0",
+    "metro-react-native-babel-preset": "^0.59.0",
     "react-test-renderer": "16.9.0"
   },
   "jest": {

Example/yarn.lock

@@ -98,6 +98,9 @@ const filter = {
 
   phoneNumbers: '+1234567890', // (String or an Array of String)
                                // if this filter is set, load(limit, filter) will only return call logs for this/these phone numbers
+
+  types: 'MISSED',             // (Single value / Array of Strings / CallType enums)
+                               // if this filter is set, load(limit, filter) will only return call logs of a specific type
 }
 
 const callLogs = await CallLogs.load(-1, filter) // applies filter with no limit (also works with a limit)

README.md

@@ -66,9 +66,13 @@ public void loadWithFilter(int limit, @Nullable ReadableMap filter, Promise prom
             boolean nullFilter = filter == null;
             String minTimestamp = !nullFilter && filter.hasKey("minTimestamp") ? filter.getString("minTimestamp") : "0";
             String maxTimestamp = !nullFilter && filter.hasKey("maxTimestamp") ? filter.getString("maxTimestamp") : "-1";
+
+            String types = !nullFilter && filter.hasKey("types") ? filter.getString("types") : "[]";
+            JSONArray typesArray= new JSONArray(types);
+            Set<String> typeSet = new HashSet<>(Arrays.asList(toStringArray(typesArray)));
+
             String phoneNumbers = !nullFilter && filter.hasKey("phoneNumbers") ? filter.getString("phoneNumbers") : "[]";
             JSONArray phoneNumbersArray= new JSONArray(phoneNumbers);
-
             Set<String> phoneNumberSet = new HashSet<>(Arrays.asList(toStringArray(phoneNumbersArray)));
 
             int callLogCount = 0;
@@ -97,9 +101,10 @@ public void loadWithFilter(int limit, @Nullable ReadableMap filter, Promise prom
                 String type = this.resolveCallType(cursor.getInt(TYPE_COLUMN_INDEX));
 
                 boolean passesPhoneFilter = phoneNumberSet == null || phoneNumberSet.isEmpty() || phoneNumberSet.contains(phoneNumber);
+                boolean passesTypeFilter = typeSet == null || typeSet.isEmpty() || typeSet.contains(type);
                 boolean passesMinTimestampFilter = minTimestamp == null || minTimestamp.equals("0") || Long.parseLong(timestampStr) >= Long.parseLong(minTimestamp);
                 boolean passesMaxTimestampFilter = maxTimestamp == null || maxTimestamp.equals("-1") || Long.parseLong(timestampStr) <= Long.parseLong(maxTimestamp);
-                boolean passesFilter = passesPhoneFilter&& passesMinTimestampFilter && passesMaxTimestampFilter;
+                boolean passesFilter = passesPhoneFilter && passesTypeFilter && passesMinTimestampFilter && passesMaxTimestampFilter;
 
                 if (passesFilter) {
                     WritableMap callLog = Arguments.createMap();
@@ -142,6 +147,14 @@ private String resolveCallType(int callTypeCode) {
                 return "INCOMING";
             case Calls.MISSED_TYPE:
                 return "MISSED";
+            case Calls.VOICEMAIL_TYPE:
+                return "VOICEMAIL";
+            case Calls.REJECTED_TYPE:
+                return "REJECTED";
+            case Calls.BLOCKED_TYPE:
+                return "BLOCKED";
+            case Calls.ANSWERED_EXTERNALLY_TYPE:
+                return "ANSWERED_EXTERNALLY";
             default:
                 return "UNKNOWN";
         }

android/src/main/java/com/wscodelabs/callLogs/CallLogModule.java

@@ -1,24 +1,34 @@
 import { NativeModules } from 'react-native';
 
-const {CallLogs: NativeCallLogs} = NativeModules
+const {CallLogs: NativeCallLogs} = NativeModules;
 
 class CallLogs {
   static async load(limit, filter) {
-    if (!filter) return NativeCallLogs.load(limit)
-    const {minTimestamp, maxTimestamp, phoneNumbers} = filter
-    const phoneNumbersArray = Array.isArray(phoneNumbers) ? phoneNumbers : typeof phoneNumbers === 'string' ? [phoneNumbers] : []
+    if (!filter) {
+      return NativeCallLogs.load(limit);
+    }
+    const {minTimestamp, maxTimestamp, types, phoneNumbers} = filter;
+    const phoneNumbersArray = Array.isArray(phoneNumbers) ? 
+      phoneNumbers : 
+      typeof phoneNumbers === 'string' ? [phoneNumbers] : [];
+
+    const typesArray = Array.isArray(types) ? 
+      types.map(x => x.toString()) : 
+      (typeof types === 'string' || typeof types === 'object') ? [types.toString()] : [];
+
     return NativeCallLogs.loadWithFilter(
       limit,
       {
         minTimestamp: minTimestamp ? minTimestamp.toString() : undefined,
         maxTimestamp: maxTimestamp ? maxTimestamp.toString() : undefined,
-        phoneNumbers: JSON.stringify(phoneNumbersArray)
+        types: JSON.stringify(typesArray),
+        phoneNumbers: JSON.stringify(phoneNumbersArray),
       }
-    )
+    );
   }
 
   static async loadAll() {
-    return NativeCallLogs.loadAll()
+    return NativeCallLogs.loadAll();
   }
 }
 

callLogs.js

@@ -1,8 +1,20 @@
 declare namespace CallLogs {
+  export enum callType {
+    OUTGOING = 'OUTGOING',
+    INCOMING = 'INCOMING',
+    MISSED = 'MISSED',
+    VOICEMAIL = 'VOICEMAIL',
+    REJECTED = 'REJECTED',
+    BLOCKED = 'BLOCKED',
+    ANSWERED_EXTERNALLY = 'ANSWERED_EXTERNALLY',
+    UNKNOWN = 'UNKNOWN',
+  }
+
   export interface CallFilter {
     minTimestamp?: number;
     maxTimestamp?: number;
-    phoneNumbers?: string;
+    types?: CallType | CallType[];
+    phoneNumbers?: string | string[];
   }
 
   export interface CallLog {
@@ -11,7 +23,7 @@ declare namespace CallLogs {
     name: string;
     timestamp: string;
     dateTime: string;
-    type: 'OUTGOING' | 'INCOMING' | 'MISSED' | 'UNKNOWN';
+    type: CallType;
     rawType: number;
   }
 

index.d.ts

@@ -1,6 +1,6 @@
 {
   "name": "react-native-call-log",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "fetch call log",
   "main": "index.js",
   "types": "index.d.ts",