loganj

diff --git a/main/src/com/joelapenna/foursquared/app/PingsService.java b/main/src/com/joelapenna/foursquared/app/PingsService.java
index 783ecd8..0c7f6e5 100644
--- a/main/src/com/joelapenna/foursquared/app/PingsService.java
+++ b/main/src/com/joelapenna/foursquared/app/PingsService.java
@@ -21,14 +21,18 @@ import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.content.ContentProviderOperation;
 import android.content.ContentResolver;

loganj

diff --git a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
index c5b77d2..3758df2 100644
--- a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
+++ b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
@@ -8,7 +8,6 @@ import com.joelapenna.foursquare.types.Checkin;
 import com.joelapenna.foursquare.types.Group;
 import com.joelapenna.foursquare.types.User;
 import com.joelapenna.foursquared.location.LocationUtils;
-import com.joelapenna.foursquared.util.StringFormatters;
 

loganj

diff --git a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
index f6de56a..c5b77d2 100644
--- a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
+++ b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
@@ -1,5 +1,6 @@
 package com.joelapenna.foursquared;
 
+import com.joelapenna.foursquare.Foursquare;
 import com.joelapenna.foursquare.Foursquare.Location;
 import com.joelapenna.foursquare.error.FoursquareError;

loganj

diff --git a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
index d881550..f6de56a 100644
--- a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
+++ b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
@@ -76,9 +76,12 @@ public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
         }
         
         final HashMap<String,User> friends = new HashMap<String,User>();
-        
+

loganj

diff --git a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
index a71c15b..d881550 100644
--- a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
+++ b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
@@ -119,11 +119,13 @@ public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
         // intersection: need to be updated
         
         ArrayList<ContentProviderOperation> opList = new ArrayList<ContentProviderOperation>();
+        ArrayList<User> justAdded = new ArrayList<User>();
         for ( User friend : friends.values() ) {

loganj

diff --git a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
index 02a7d8b..a71c15b 100644
--- a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
+++ b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
@@ -1,10 +1,13 @@
 package com.joelapenna.foursquared;
 
+import com.joelapenna.foursquare.Foursquare.Location;
 import com.joelapenna.foursquare.error.FoursquareError;
 import com.joelapenna.foursquare.error.FoursquareException;

loganj

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index cbf42ec..3849d7b 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -306,6 +306,11 @@
         <action
           android:name="com.joelapenna.foursquared.intent.action.LOGGED_OUT" />
       </intent-filter>
+      <intent-filter>
+	      <action android:name="android.intent.action.VIEW" />

loganj

diff --git a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
index a75b966..02a7d8b 100644
--- a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
+++ b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
@@ -91,36 +91,23 @@ public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
         // contacts - friends: need to be deleted
         // intersection: need to be updated
         
-        ArrayList<ContentProviderOperation> opList = null;
-        int backReference = 0;

loganj

diff --git a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
index a75b966..02a7d8b 100644
--- a/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
+++ b/main/src/com/joelapenna/foursquared/ContactsSyncAdapter.java
@@ -91,36 +91,23 @@ public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
         // contacts - friends: need to be deleted
         // intersection: need to be updated
         
-        ArrayList<ContentProviderOperation> opList = null;
-        int backReference = 0;

loganj

 batch = new ArrayList<ContentProviderOperation>();
-int currentContactIndex = 0;
-
 for ( User contact : new User[] { alice, bob, carol } ) {
+	insertContact(contact, batch);
+}
 
+private void insertContact(User contact, ArrayList<ContentProviderOperation> batch) {	
+	int currentContactIndex = batch.size();
+