From c2240966efdc2be031d6cb66c6664b1920b653ec Mon Sep 17 00:00:00 2001
From: macdonst <simon.macdonald@gmail.com>
Date: Thu, 30 Sep 2010 05:43:00 +0800
Subject: [PATCH] Removing extra log calls

---
 example/index.html                                  |  2 +-
 .../src/com/phonegap/ContactAccessorSdk3_4.java     |  8 --------
 framework/src/com/phonegap/ContactAccessorSdk5.java | 13 -------------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/example/index.html b/example/index.html
index 745856ce..bdfee7c3 100644
--- a/example/index.html
+++ b/example/index.html
@@ -104,7 +104,7 @@
 		var obj = new ContactFindOptions();
 		obj.filter="";
 		obj.multiple=true;
-		navigator.service.contacts.find(["name", "phone", "email"], count_contacts, fail, obj);
+		navigator.service.contacts.find(["displayName", "phoneNumbers", "emails"], count_contacts, fail, obj);
 	}
 
 	function count_contacts(contacts)
diff --git a/framework/src/com/phonegap/ContactAccessorSdk3_4.java b/framework/src/com/phonegap/ContactAccessorSdk3_4.java
index dd6e2721..086e1052 100644
--- a/framework/src/com/phonegap/ContactAccessorSdk3_4.java
+++ b/framework/src/com/phonegap/ContactAccessorSdk3_4.java
@@ -162,7 +162,6 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 			for (int i=0; i<filter.length(); i++) {
 				key = filter.getString(i);
 				if (key.startsWith("displayName")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							People.CONTENT_URI,
 							People._ID,
@@ -178,7 +177,6 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 //							new String[] {searchTerm, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE});
 //				}
 				else if (key.startsWith("phoneNumbers")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							Phones.CONTENT_URI,
 							Phones.PERSON_ID,
@@ -186,7 +184,6 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 							new String[] {searchTerm});
 				}
 				else if (key.startsWith("emails")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactMethods.CONTENT_EMAIL_URI,
 							ContactMethods.PERSON_ID,
@@ -194,7 +191,6 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 							new String[] {searchTerm, ContactMethods.CONTENT_EMAIL_ITEM_TYPE});
 				}
 				else if (key.startsWith("addresses")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactMethods.CONTENT_URI,
 							ContactMethods.PERSON_ID,
@@ -202,7 +198,6 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 							new String[] {searchTerm, ContactMethods.CONTENT_POSTAL_ITEM_TYPE});					
 				}
 				else if (key.startsWith("ims")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactMethods.CONTENT_URI,
 							ContactMethods.PERSON_ID,
@@ -210,7 +205,6 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 							new String[] {searchTerm, ContactMethods.CONTENT_IM_ITEM_TYPE});					
 				}
 				else if (key.startsWith("organizations")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							Organizations.CONTENT_URI,
 							ContactMethods.PERSON_ID,
@@ -218,7 +212,6 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 							new String[] {searchTerm});					
 				}
 				else if (key.startsWith("note")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							People.CONTENT_URI,
 							People._ID,
@@ -246,7 +239,6 @@ public class ContactAccessorSdk3_4 extends ContactAccessor {
 				null);
 		
 		while (cursor.moveToNext()) {
-			Log.d(LOG_TAG, "ID = " + cursor.getString(cursor.getColumnIndex(projection)));
 			contactIds.add(cursor.getString(cursor.getColumnIndex(projection)));
 		}
 		cursor.close();
diff --git a/framework/src/com/phonegap/ContactAccessorSdk5.java b/framework/src/com/phonegap/ContactAccessorSdk5.java
index 8cbcafb8..bcad148f 100644
--- a/framework/src/com/phonegap/ContactAccessorSdk5.java
+++ b/framework/src/com/phonegap/ContactAccessorSdk5.java
@@ -147,7 +147,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 		while (it.hasNext() && (pos < limit)) {
 			contact = new JSONObject();
 			contactId = it.next();
-			Log.d(LOG_TAG, "Contact ID = " + contactId);
 			
 			try {
 				contact.put("id", contactId);
@@ -182,7 +181,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 			for (int i=0; i<filter.length(); i++) {
 				key = filter.getString(i);
 				if (key.startsWith("displayName")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.Contacts.CONTENT_URI,
 							ContactsContract.Contacts._ID,
@@ -190,7 +188,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 							new String[] {searchTerm});
 				}
 				else if (key.startsWith("name")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.Data.CONTENT_URI,
 							ContactsContract.Data.CONTACT_ID,
@@ -198,7 +195,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 							new String[] {searchTerm, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE});
 				}
 				else if (key.startsWith("nickname")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.Data.CONTENT_URI,
 							ContactsContract.Data.CONTACT_ID,
@@ -206,7 +202,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 							new String[] {searchTerm, ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE});					
 				}
 				else if (key.startsWith("phoneNumbers")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
 							ContactsContract.CommonDataKinds.Phone.CONTACT_ID,
@@ -214,7 +209,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 							new String[] {searchTerm});
 				}
 				else if (key.startsWith("emails")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.CommonDataKinds.Email.CONTENT_URI,
 							ContactsContract.CommonDataKinds.Email.CONTACT_ID,
@@ -222,7 +216,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 							new String[] {searchTerm});
 				}
 				else if (key.startsWith("addresses")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.Data.CONTENT_URI,
 							ContactsContract.Data.CONTACT_ID,
@@ -230,7 +223,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 							new String[] {searchTerm, ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE});					
 				}
 				else if (key.startsWith("ims")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.Data.CONTENT_URI,
 							ContactsContract.Data.CONTACT_ID,
@@ -238,7 +230,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 							new String[] {searchTerm, ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE});					
 				}
 				else if (key.startsWith("organizations")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.Data.CONTENT_URI,
 							ContactsContract.Data.CONTACT_ID,
@@ -252,7 +243,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 					
 				}
 				else if (key.startsWith("note")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.Data.CONTENT_URI,
 							ContactsContract.Data.CONTACT_ID,
@@ -260,7 +250,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 							new String[] {searchTerm, ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE});					
 				}
 				else if (key.startsWith("relationships")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.Data.CONTENT_URI,
 							ContactsContract.Data.CONTACT_ID,
@@ -268,7 +257,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 							new String[] {searchTerm, ContactsContract.CommonDataKinds.Relation.CONTENT_ITEM_TYPE});					
 				}
 				else if (key.startsWith("urls")) {
-					Log.d(LOG_TAG, "Doing " + key + " query");
 					doQuery(searchTerm, contactIds,
 							ContactsContract.Data.CONTENT_URI,
 							ContactsContract.Data.CONTACT_ID,
@@ -297,7 +285,6 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 				null);
 		
 		while (cursor.moveToNext()) {
-			Log.d(LOG_TAG, "ID = " + cursor.getString(cursor.getColumnIndex(projection)));
 			contactIds.add(cursor.getString(cursor.getColumnIndex(projection)));
 		}
 		cursor.close();