1 files changed, 13 insertions, 49 deletions

diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 03ced289..66db353b 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -10,6 +10,7 @@ import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.services.ImageProvider;
+import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate;
 import eu.siacs.conversations.utils.ExceptionHelper;
 import eu.siacs.conversations.utils.UIHelper;
 import android.net.Uri;
@@ -83,10 +84,10 @@ public class ConversationActivity extends XmppActivity {
 	private boolean showLastseen = false;
 	private ArrayAdapter<Conversation> listAdapter;
 
-	private OnConversationListChangedListener onConvChanged = new OnConversationListChangedListener() {
-
+	private OnConversationUpdate onConvChanged = new OnConversationUpdate() {
+		
 		@Override
-		public void onConversationListChanged() {
+		public void onConversationUpdate() {
 			runOnUiThread(new Runnable() {
 
 				@Override
@@ -97,7 +98,7 @@ public class ConversationActivity extends XmppActivity {
 							swapConversationFragment();
 						} else {
 							startActivity(new Intent(getApplicationContext(),
-									ContactsActivity.class));
+									StartConversation.class));
 							finish();
 						}
 					}
@@ -419,37 +420,6 @@ public class ConversationActivity extends XmppActivity {
 			selectPresenceToAttachFile(attachmentChoice);
 		} else {
 			selectPresenceToAttachFile(attachmentChoice);
-			/*AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setTitle(getString(R.string.otr_file_transfer));
-			builder.setMessage(getString(R.string.otr_file_transfer_msg));
-			builder.setNegativeButton(getString(R.string.cancel), null);
-			if (conversation.getContact().getPgpKeyId() == 0) {
-				builder.setPositiveButton(getString(R.string.send_unencrypted),
-						new OnClickListener() {
-
-							@Override
-							public void onClick(DialogInterface dialog,
-									int which) {
-								conversation
-										.setNextEncryption(Message.ENCRYPTION_NONE);
-								attachFile(attachmentChoice);
-							}
-						});
-			} else {
-				builder.setPositiveButton(
-						getString(R.string.use_pgp_encryption),
-						new OnClickListener() {
-
-							@Override
-							public void onClick(DialogInterface dialog,
-									int which) {
-								conversation
-										.setNextEncryption(Message.ENCRYPTION_PGP);
-								attachFile(attachmentChoice);
-							}
-						});
-			}
-			builder.create().show();*/
 		}
 	}
 
@@ -488,7 +458,7 @@ public class ConversationActivity extends XmppActivity {
 			attachFilePopup.show();
 			break;
 		case R.id.action_add:
-			startActivity(new Intent(this, ContactsActivity.class));
+			startActivity(new Intent(this, StartConversation.class));
 			break;
 		case R.id.action_archive:
 			this.endConversation(getSelectedConversation());
@@ -496,12 +466,7 @@ public class ConversationActivity extends XmppActivity {
 		case R.id.action_contact_details:
 			Contact contact = this.getSelectedConversation().getContact();
 			if (contact.showInRoster()) {
-				Intent intent = new Intent(this, ContactDetailsActivity.class);
-				intent.setAction(ContactDetailsActivity.ACTION_VIEW_CONTACT);
-				intent.putExtra("account", this.getSelectedConversation()
-						.getAccount().getJid());
-				intent.putExtra("contact", contact.getJid());
-				startActivity(intent);
+				switchToContactDetails(contact);
 			} else {
 				showAddToRosterDialog(getSelectedConversation());
 			}
@@ -513,11 +478,11 @@ public class ConversationActivity extends XmppActivity {
 			startActivity(intent);
 			break;
 		case R.id.action_invite:
-			Intent inviteIntent = new Intent(getApplicationContext(),
+			/*Intent inviteIntent = new Intent(getApplicationContext(),
 					ContactsActivity.class);
 			inviteIntent.setAction("invite");
 			inviteIntent.putExtra("uuid", getSelectedConversation().getUuid());
-			startActivity(inviteIntent);
+			startActivity(inviteIntent);*/
 			break;
 		case R.id.action_security:
 			final Conversation conversation = getSelectedConversation();
@@ -691,7 +656,7 @@ public class ConversationActivity extends XmppActivity {
 			this.onBackendConnected();
 		}
 		if (conversationList.size() >= 1) {
-			onConvChanged.onConversationListChanged();
+			onConvChanged.onConversationUpdate();
 		}
 	}
 
@@ -734,7 +699,7 @@ public class ConversationActivity extends XmppActivity {
 				finish();
 			} else if (conversationList.size() <= 0) {
 				// add no history
-				startActivity(new Intent(this, ContactsActivity.class));
+				startActivity(new Intent(this, StartConversation.class));
 				finish();
 			} else {
 				spl.openPane();
@@ -768,7 +733,7 @@ public class ConversationActivity extends XmppActivity {
 				ConversationFragment selectedFragment = (ConversationFragment) getFragmentManager()
 						.findFragmentByTag("conversation");
 				if (selectedFragment != null) {
-					selectedFragment.hidePgpPassphraseBox();
+					selectedFragment.hideSnackbar();
 				}
 			} else if (requestCode == REQUEST_ATTACH_FILE_DIALOG) {
 				attachImageToConversation(getSelectedConversation(),
@@ -841,8 +806,7 @@ public class ConversationActivity extends XmppActivity {
 	}
 
 	public void updateConversationList() {
-		conversationList.clear();
-		conversationList.addAll(xmppConnectionService.getConversations());
+		xmppConnectionService.populateWithOrderedConversations(conversationList);
 		listView.invalidateViews();
 	}