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

4 files changed, 59 insertions, 99 deletions

diff --git a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 06179bc6e..72a0909a8 100644
--- a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -1,8 +1,6 @@
 package eu.siacs.conversations.ui;
 
-import java.math.BigInteger;
 import java.util.Iterator;
-import java.util.Locale;
 
 import org.openintents.openpgp.util.OpenPgpUtils;
 
@@ -17,7 +15,6 @@ import android.os.Bundle;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Intents;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -31,6 +28,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
+import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.utils.UIHelper;
@@ -40,12 +38,14 @@ public class ContactDetailsActivity extends XmppActivity {
 
 	protected ContactDetailsActivity activity = this;
 
-	private String uuid;
 	private Contact contact;
-
+	
+	private String accountJid;
+	private String contactJid;
+	
 	private EditText name;
-	private TextView contactJid;
-	private TextView accountJid;
+	private TextView contactJidTv;
+	private TextView accountJidTv;
 	private TextView status;
 	private TextView askAgain;
 	private CheckBox send;
@@ -56,7 +56,7 @@ public class ContactDetailsActivity extends XmppActivity {
 
 		@Override
 		public void onClick(DialogInterface dialog, int which) {
-			activity.xmppConnectionService.deleteContact(contact);
+			activity.xmppConnectionService.deleteContactOnServer(contact);
 			activity.finish();
 		}
 	};
@@ -65,8 +65,8 @@ public class ContactDetailsActivity extends XmppActivity {
 
 		@Override
 		public void onClick(DialogInterface dialog, int which) {
-			contact.setDisplayName(name.getText().toString());
-			activity.xmppConnectionService.updateContact(contact);
+			contact.setServerName(name.getText().toString());
+			activity.xmppConnectionService.pushContactToServer(contact);
 			populateView();
 		}
 	};
@@ -104,12 +104,13 @@ public class ContactDetailsActivity extends XmppActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		if (getIntent().getAction().equals(ACTION_VIEW_CONTACT)) {
-			this.uuid = getIntent().getExtras().getString("uuid");
+			this.accountJid = getIntent().getExtras().getString("account");
+			this.contactJid = getIntent().getExtras().getString("contact");
 		}
 		setContentView(R.layout.activity_contact_details);
 
-		contactJid = (TextView) findViewById(R.id.details_contactjid);
-		accountJid = (TextView) findViewById(R.id.details_account);
+		contactJidTv = (TextView) findViewById(R.id.details_contactjid);
+		accountJidTv = (TextView) findViewById(R.id.details_account);
 		status = (TextView) findViewById(R.id.details_contactstatus);
 		send = (CheckBox) findViewById(R.id.details_send_presence);
 		receive = (CheckBox) findViewById(R.id.details_receive_presence);
@@ -170,18 +171,18 @@ public class ContactDetailsActivity extends XmppActivity {
 
 	private void populateView() {
 		setTitle(contact.getDisplayName());
-		if (contact.getSubscriptionOption(Contact.Subscription.FROM)) {
+		if (contact.getOption(Contact.Options.FROM)) {
 			send.setChecked(true);
 		} else {
 			send.setText(R.string.preemptively_grant);
 			if (contact
-					.getSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT)) {
+					.getOption(Contact.Options.PREEMPTIVE_GRANT)) {
 				send.setChecked(true);
 			} else {
 				send.setChecked(false);
 			}
 		}
-		if (contact.getSubscriptionOption(Contact.Subscription.TO)) {
+		if (contact.getOption(Contact.Options.TO)) {
 			receive.setChecked(true);
 		} else {
 			receive.setText(R.string.ask_for_presence_updates);
@@ -195,7 +196,7 @@ public class ContactDetailsActivity extends XmppActivity {
 					
 				}
 			});
-			if (contact.getSubscriptionOption(Contact.Subscription.ASKING)) {
+			if (contact.getOption(Contact.Options.ASKING)) {
 				receive.setChecked(true);
 			} else {
 				receive.setChecked(false);
@@ -233,11 +234,11 @@ public class ContactDetailsActivity extends XmppActivity {
 			break;
 		}
 		if (contact.getPresences().size() > 1) {
-			contactJid.setText(contact.getJid()+" ("+contact.getPresences().size()+")");
+			contactJidTv.setText(contact.getJid()+" ("+contact.getPresences().size()+")");
 		} else {
-			contactJid.setText(contact.getJid());
+			contactJidTv.setText(contact.getJid());
 		}
-		accountJid.setText(contact.getAccount().getJid());
+		accountJidTv.setText(contact.getAccount().getJid());
 
 		UIHelper.prepareContactBadge(this, badge, contact, getApplicationContext());
 
@@ -286,65 +287,66 @@ public class ContactDetailsActivity extends XmppActivity {
 
 	@Override
 	public void onBackendConnected() {
-		if (uuid != null) {
-			this.contact = xmppConnectionService.findContact(uuid);
-			if (this.contact != null) {
-				populateView();
+		if ((accountJid != null)&&(contactJid != null)) {
+			Account account = xmppConnectionService.findAccountByJid(accountJid);
+			if (account==null) {
+				return;
 			}
+			this.contact = account.getRoster().getContact(contactJid);
+			populateView();
 		}
 	}
 
 	@Override
 	protected void onStop() {
 		super.onStop();
-		boolean needsUpdating = false;
-		if (contact.getSubscriptionOption(Contact.Subscription.FROM)) {
+		boolean updated = false;
+		if (contact.getOption(Contact.Options.FROM)) {
 			if (!send.isChecked()) {
-				contact.resetSubscriptionOption(Contact.Subscription.FROM);
-				contact.resetSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT);
+				contact.resetOption(Contact.Options.FROM);
+				contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
 				activity.xmppConnectionService.stopPresenceUpdatesTo(contact);
-				needsUpdating = true;
+				updated = true;
 			}
 		} else {
 			if (contact
-					.getSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT)) {
+					.getOption(Contact.Options.PREEMPTIVE_GRANT)) {
 				if (!send.isChecked()) {
-					contact.resetSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT);
-					needsUpdating = true;
+					contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
+					updated = true;
 				}
 			} else {
 				if (send.isChecked()) {
-					contact.setSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT);
-					needsUpdating = true;
+					contact.setOption(Contact.Options.PREEMPTIVE_GRANT);
+					updated = true;
 				}
 			}
 		}
-		if (contact.getSubscriptionOption(Contact.Subscription.TO)) {
+		if (contact.getOption(Contact.Options.TO)) {
 			if (!receive.isChecked()) {
-				contact.resetSubscriptionOption(Contact.Subscription.TO);
+				contact.resetOption(Contact.Options.TO);
 				activity.xmppConnectionService.stopPresenceUpdatesFrom(contact);
-				needsUpdating = true;
+				updated = true;
 			}
 		} else {
-			if (contact.getSubscriptionOption(Contact.Subscription.ASKING)) {
+			if (contact.getOption(Contact.Options.ASKING)) {
 				if (!receive.isChecked()) {
-					contact.resetSubscriptionOption(Contact.Subscription.ASKING);
+					contact.resetOption(Contact.Options.ASKING);
 					activity.xmppConnectionService
 							.stopPresenceUpdatesFrom(contact);
-					needsUpdating = true;
+					updated = true;
 				}
 			} else {
 				if (receive.isChecked()) {
-					contact.setSubscriptionOption(Contact.Subscription.ASKING);
+					contact.setOption(Contact.Options.ASKING);
 					activity.xmppConnectionService
 							.requestPresenceUpdatesFrom(contact);
-					needsUpdating = true;
+					updated = true;
 				}
 			}
 		}
-		if (needsUpdating) {
+		if (updated) {
 			Toast.makeText(getApplicationContext(), "Subscription updated", Toast.LENGTH_SHORT).show();
-			activity.xmppConnectionService.updateContact(contact);
 		}
 	}
 
diff --git a/src/eu/siacs/conversations/ui/ContactsActivity.java b/src/eu/siacs/conversations/ui/ContactsActivity.java
index 6e15b678b..d703b172e 100644
--- a/src/eu/siacs/conversations/ui/ContactsActivity.java
+++ b/src/eu/siacs/conversations/ui/ContactsActivity.java
@@ -18,7 +18,6 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.LayoutInflater;
@@ -34,13 +33,11 @@ import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ListView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.ImageView;
 import android.widget.Toast;
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
@@ -130,8 +127,10 @@ public class ContactsActivity extends XmppActivity {
 				Intent intent = new Intent(getApplicationContext(),
 						ContactDetailsActivity.class);
 				intent.setAction(ContactDetailsActivity.ACTION_VIEW_CONTACT);
-				intent.putExtra("uuid", selectedContacts.get(0).getUuid());
+				intent.putExtra("account", selectedContacts.get(0).getAccount().getJid());
+				intent.putExtra("contact",selectedContacts.get(0).getJid());
 				startActivity(intent);
+				finish();
 				break;
 			case R.id.action_invite:
 				invite();
@@ -270,7 +269,7 @@ public class ContactsActivity extends XmppActivity {
 
 		aggregatedContacts.clear();
 		for (Contact contact : rosterContacts) {
-			if (contact.match(searchString))
+			if (contact.match(searchString)&&(contact.getOption(Contact.Options.IN_ROSTER)))
 				aggregatedContacts.add(contact);
 		}
 
@@ -287,9 +286,8 @@ public class ContactsActivity extends XmppActivity {
 		if (aggregatedContacts.size() == 0) {
 
 			if (Validator.isValidJid(searchString)) {
-				String name = searchString.split("@")[0];
-				Contact newContact = new Contact(null, name, searchString, null);
-				newContact.flagAsNotInRoster();
+				Contact newContact = new Contact(searchString);
+				newContact.resetOption(Contact.Options.IN_ROSTER);
 				aggregatedContacts.add(newContact);
 				contactsHeader.setText("Create new contact");
 			} else {
@@ -463,7 +461,7 @@ public class ContactsActivity extends XmppActivity {
 	}
 
 	public void startConversation(Contact contact, Account account, boolean muc) {
-		if (!contact.isInRoster()&&(!muc)) {
+		if (!contact.getOption(Contact.Options.IN_ROSTER)&&(!muc)) {
 			xmppConnectionService.createContact(contact);
 		}
 		Conversation conversation = xmppConnectionService
@@ -517,7 +515,7 @@ public class ContactsActivity extends XmppActivity {
 		this.rosterContacts.clear();
 		for(Account account : accounts) {
 			if (account.getStatus() != Account.STATUS_DISABLED) {
-				rosterContacts.addAll(xmppConnectionService.getRoster(account));
+				rosterContacts.addAll(account.getRoster().getContacts());
 			}
 		}
 		updateAggregatedContacts();
@@ -533,52 +531,12 @@ public class ContactsActivity extends XmppActivity {
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-		case R.id.action_refresh_contacts:
-			refreshContacts();
-			break;
 		default:
 			break;
 		}
 		return super.onOptionsItemSelected(item);
 	}
 
-	private void refreshContacts() {
-		final ProgressBar progress = (ProgressBar) findViewById(R.id.progressBar1);
-		final EditText searchBar = (EditText) findViewById(R.id.new_conversation_search);
-		final TextView contactsHeader = (TextView) findViewById(R.id.contacts_header);
-		final ListView contactList = (ListView) findViewById(R.id.contactList);
-		searchBar.setVisibility(View.GONE);
-		contactsHeader.setVisibility(View.GONE);
-		contactList.setVisibility(View.GONE);
-		progress.setVisibility(View.VISIBLE);
-		this.accounts = xmppConnectionService.getAccounts();
-		this.rosterContacts.clear();
-		for (int i = 0; i < accounts.size(); ++i) {
-			if (accounts.get(i).getStatus() == Account.STATUS_ONLINE) {
-				xmppConnectionService.updateRoster(accounts.get(i),
-						new OnRosterFetchedListener() {
-
-							@Override
-							public void onRosterFetched(
-									final List<Contact> roster) {
-								runOnUiThread(new Runnable() {
-
-									@Override
-									public void run() {
-										rosterContacts.addAll(roster);
-										progress.setVisibility(View.GONE);
-										searchBar.setVisibility(View.VISIBLE);
-										contactList.setVisibility(View.VISIBLE);
-										contactList.setVisibility(View.VISIBLE);
-										updateAggregatedContacts();
-									}
-								});
-							}
-						});
-			}
-		}
-	}
-
 	@Override
 	public void onActionModeStarted(ActionMode mode) {
 		super.onActionModeStarted(mode);
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index c3626ee11..346cd2fc4 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -474,10 +474,11 @@ public class ConversationActivity extends XmppActivity {
 			break;
 		case R.id.action_contact_details:
 			Contact contact = this.getSelectedConversation().getContact();
-			if (contact != null) {
+			if (contact.getOption(Contact.Options.IN_ROSTER)) {
 				Intent intent = new Intent(this, ContactDetailsActivity.class);
 				intent.setAction(ContactDetailsActivity.ACTION_VIEW_CONTACT);
-				intent.putExtra("uuid", contact.getUuid());
+				intent.putExtra("account", this.getSelectedConversation().getAccount().getJid());
+				intent.putExtra("contact",contact.getJid());
 				startActivity(intent);
 			} else {
 				showAddToRosterDialog(getSelectedConversation());
@@ -874,8 +875,7 @@ public class ConversationActivity extends XmppActivity {
 			public void onClick(DialogInterface dialog, int which) {
 				String jid = conversation.getContactJid();
 				Account account = getSelectedConversation().getAccount();
-				String name = jid.split("@")[0];
-				Contact contact = new Contact(account, name, jid, null);
+				Contact contact = account.getRoster().getContact(jid);
 				xmppConnectionService.createContact(contact);
 			}
 		});
diff --git a/src/eu/siacs/conversations/ui/ShareWithActivity.java b/src/eu/siacs/conversations/ui/ShareWithActivity.java
index 1bc9fc460..ccb1e8e7b 100644
--- a/src/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -102,7 +102,7 @@ public class ShareWithActivity extends XmppActivity {
 		contacts.removeAllViews();
 		final List<Contact> contactsList = new ArrayList<Contact>();
 		for(Account account : xmppConnectionService.getAccounts()) {
-			for(final Contact contact : xmppConnectionService.getRoster(account)) {
+			for(final Contact contact : account.getRoster().getContacts()) {
 				if (!displayedContacts.contains(contact.getUuid())) {
 					contactsList.add(contact);
 				}