reworked roster/contact handling. might break some stuff. not sycing to disk yet

3 files changed, 11 insertions, 18 deletions

diff --git a/src/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java b/src/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java
index fa8cea04c..9a6897689 100644
--- a/src/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java
+++ b/src/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java
@@ -1,9 +1,9 @@
 package eu.siacs.conversations.utils;
 
-import java.util.Hashtable;
+import java.util.List;
 
 import android.os.Bundle;
 
 public interface OnPhoneContactsLoadedListener {
-	public void onPhoneContactsLoaded(Hashtable<String, Bundle> phoneContacts);
+	public void onPhoneContactsLoaded(List<Bundle> phoneContacts);
 }
diff --git a/src/eu/siacs/conversations/utils/PhoneHelper.java b/src/eu/siacs/conversations/utils/PhoneHelper.java
index 6355e3786..773312bb3 100644
--- a/src/eu/siacs/conversations/utils/PhoneHelper.java
+++ b/src/eu/siacs/conversations/utils/PhoneHelper.java
@@ -1,8 +1,8 @@
 package eu.siacs.conversations.utils;
 
-import java.util.Hashtable;
+import java.util.ArrayList;
+import java.util.List;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.CursorLoader;
 import android.content.Loader;
@@ -10,21 +10,15 @@ import android.content.Loader.OnLoadCompleteListener;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Looper;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Profile;
-import android.provider.MediaStore;
 
 public class PhoneHelper {
 
 	public static void loadPhoneContacts(Context context,
 			final OnPhoneContactsLoadedListener listener) {
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		final Looper mLooper = Looper.myLooper();
-		final Hashtable<String, Bundle> phoneContacts = new Hashtable<String, Bundle>();
-
+		final List<Bundle> phoneContacts = new ArrayList<Bundle>();
+		
 		final String[] PROJECTION = new String[] { ContactsContract.Data._ID,
 				ContactsContract.Data.DISPLAY_NAME,
 				ContactsContract.Data.PHOTO_THUMBNAIL_URI,
@@ -58,15 +52,14 @@ public class PhoneHelper {
 									.getColumnIndex(ContactsContract.Data.PHOTO_THUMBNAIL_URI)));
 					contact.putString("lookup", cursor.getString(cursor
 							.getColumnIndex(ContactsContract.Data.LOOKUP_KEY)));
-					phoneContacts.put(
-							cursor.getString(cursor
-									.getColumnIndex(ContactsContract.CommonDataKinds.Im.DATA)),
-							contact);
+					
+					contact.putString("jid",cursor.getString(cursor
+									.getColumnIndex(ContactsContract.CommonDataKinds.Im.DATA)));
+					phoneContacts.add(contact);
 				}
 				if (listener != null) {
 					listener.onPhoneContactsLoaded(phoneContacts);
 				}
-				mLooper.quit();
 			}
 		});
 		mCursorLoader.startLoading();
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index ef291c2bc..e6aca3973 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -506,7 +506,7 @@ public class UIHelper {
 			public void onClick(DialogInterface dialog, int which) {
 				contact.addOtrFingerprint(conversation.getOtrFingerprint());
 				msg.setVisibility(View.GONE);
-				activity.xmppConnectionService.updateContact(contact);
+				//activity.xmppConnectionService.updateContact(contact);
 			}
 		});
 		builder.setView(view);