12 files changed, 63 insertions, 75 deletions

diff --git a/src/de/gultsch/chat/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 88d30bc5..7660b8fd 100644
--- a/src/de/gultsch/chat/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1,22 +1,16 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.openintents.openpgp.OpenPgpSignatureResult;
-import org.openintents.openpgp.util.OpenPgpConstants;
-
-import de.gultsch.chat.R;
-import de.gultsch.chat.R.id;
-import de.gultsch.chat.crypto.PgpEngine;
-import de.gultsch.chat.crypto.PgpEngine.UserInputRequiredException;
-import de.gultsch.chat.entities.Account;
-import de.gultsch.chat.entities.Contact;
-import de.gultsch.chat.entities.Conversation;
-import de.gultsch.chat.entities.Message;
-import de.gultsch.chat.utils.UIHelper;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.entities.Contact;
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.utils.UIHelper;
 import android.net.Uri;
 import android.os.Bundle;
 import android.app.AlertDialog;
@@ -25,7 +19,6 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.IntentSender.SendIntentException;
 import android.graphics.Typeface;
 import android.support.v4.widget.SlidingPaneLayout;
 import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener;
@@ -67,7 +60,6 @@ public class ConversationActivity extends XmppActivity {
 		
 		@Override
 		public void onConversationListChanged() {
-			final Conversation currentConv = getSelectedConversation();
 			conversationList.clear();
 			conversationList.addAll(xmppConnectionService
 					.getConversations());
@@ -104,8 +96,6 @@ public class ConversationActivity extends XmppActivity {
 			xmppConnectionService.createContact(contact);
 		}
 	};
-	private boolean contactInserted = false;
-	
 	
 	public List<Conversation> getConversationList() {
 		return this.conversationList;
@@ -206,7 +196,7 @@ public class ConversationActivity extends XmppActivity {
 				}
 			}
 		});
-		spl = (SlidingPaneLayout) findViewById(id.slidingpanelayout);
+		spl = (SlidingPaneLayout) findViewById(R.id.slidingpanelayout);
 		spl.setParallaxDistance(150);
 		spl.setShadowResource(R.drawable.es_slidingpane_shadow);
 		spl.setSliderFadeColor(0);
@@ -257,19 +247,26 @@ public class ConversationActivity extends XmppActivity {
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.conversations, menu);
 		MenuItem menuSecure = (MenuItem) menu.findItem(R.id.action_security);
+		MenuItem menuArchive = (MenuItem) menu.findItem(R.id.action_archive);
+		MenuItem menuMucDetails = (MenuItem) menu.findItem(R.id.action_muc_details);
+		MenuItem menuContactDetails = (MenuItem) menu.findItem(R.id.action_contact_details);
 		
 		if (spl.isOpen()) {
-			((MenuItem) menu.findItem(R.id.action_archive)).setVisible(false);
-			((MenuItem) menu.findItem(R.id.action_details)).setVisible(false);
+			menuArchive.setVisible(false);
+			menuMucDetails.setVisible(false);
+			menuContactDetails.setVisible(false);
 			menuSecure.setVisible(false);
 		} else {
 			((MenuItem) menu.findItem(R.id.action_add)).setVisible(false);
 			if (this.getSelectedConversation()!=null) {
 				if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
-					((MenuItem) menu.findItem(R.id.action_security)).setVisible(false);
+					menuMucDetails.setVisible(true);
+					menuContactDetails.setVisible(false);
 					menuSecure.setVisible(false);
-					((MenuItem) menu.findItem(R.id.action_archive)).setTitle("Leave conference");
+					menuArchive.setTitle("Leave conference");
 				} else {
+					menuContactDetails.setVisible(true);
+					menuMucDetails.setVisible(false);
 					if (this.getSelectedConversation().getLatestMessage().getEncryption() != Message.ENCRYPTION_NONE) {
 						menuSecure.setIcon(R.drawable.ic_action_secure);
 					}
@@ -302,7 +299,7 @@ public class ConversationActivity extends XmppActivity {
 			xmppConnectionService.archiveConversation(conv);
 			selectedConversation = conversationList.get(0);
 			break;
-		case R.id.action_details:
+		case R.id.action_contact_details:
 			DialogContactDetails details = new DialogContactDetails();
 			Contact contact = this.getSelectedConversation().getContact();
 			if (contact != null) {
diff --git a/src/de/gultsch/chat/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index af07fdbb..ff06fafc 100644
--- a/src/de/gultsch/chat/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1,4 +1,4 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -10,15 +10,15 @@ import java.util.Set;
 
 import net.java.otr4j.session.SessionStatus;
 
-import de.gultsch.chat.R;
-import de.gultsch.chat.crypto.PgpEngine.OpenPgpException;
-import de.gultsch.chat.crypto.PgpEngine.UserInputRequiredException;
-import de.gultsch.chat.entities.Contact;
-import de.gultsch.chat.entities.Conversation;
-import de.gultsch.chat.entities.Message;
-import de.gultsch.chat.services.XmppConnectionService;
-import de.gultsch.chat.utils.PhoneHelper;
-import de.gultsch.chat.utils.UIHelper;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.crypto.PgpEngine.OpenPgpException;
+import eu.siacs.conversations.crypto.PgpEngine.UserInputRequiredException;
+import eu.siacs.conversations.entities.Contact;
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.utils.PhoneHelper;
+import eu.siacs.conversations.utils.UIHelper;
 import android.app.AlertDialog;
 import android.app.Fragment;
 import android.content.DialogInterface;
diff --git a/src/de/gultsch/chat/ui/DialogContactDetails.java b/src/eu/siacs/conversations/ui/DialogContactDetails.java
index 324a7aac..1210bc3c 100644
--- a/src/de/gultsch/chat/ui/DialogContactDetails.java
+++ b/src/eu/siacs/conversations/ui/DialogContactDetails.java
@@ -1,9 +1,9 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
-import de.gultsch.chat.R;
-import de.gultsch.chat.entities.Contact;
-import de.gultsch.chat.entities.Presences;
-import de.gultsch.chat.utils.UIHelper;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.Contact;
+import eu.siacs.conversations.entities.Presences;
+import eu.siacs.conversations.utils.UIHelper;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -13,7 +13,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.View;
 import android.view.View.OnClickListener;
diff --git a/src/de/gultsch/chat/ui/EditAccount.java b/src/eu/siacs/conversations/ui/EditAccount.java
index 88aa76f5..3ec74174 100644
--- a/src/de/gultsch/chat/ui/EditAccount.java
+++ b/src/eu/siacs/conversations/ui/EditAccount.java
@@ -1,13 +1,11 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
-import de.gultsch.chat.R;
-import de.gultsch.chat.entities.Account;
-import de.gultsch.chat.utils.Validator;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.utils.Validator;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,7 +14,6 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 public class EditAccount extends DialogFragment {
diff --git a/src/de/gultsch/chat/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index bcc5306d..22b82e77 100644
--- a/src/de/gultsch/chat/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -1,13 +1,13 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import de.gultsch.chat.R;
-import de.gultsch.chat.crypto.PgpEngine;
-import de.gultsch.chat.crypto.PgpEngine.UserInputRequiredException;
-import de.gultsch.chat.entities.Account;
-import de.gultsch.chat.ui.EditAccount.EditAccountListener;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.crypto.PgpEngine;
+import eu.siacs.conversations.crypto.PgpEngine.UserInputRequiredException;
+import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.ui.EditAccount.EditAccountListener;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
diff --git a/src/de/gultsch/chat/ui/NewConversationActivity.java b/src/eu/siacs/conversations/ui/NewConversationActivity.java
index ac178fad..628a3047 100644
--- a/src/de/gultsch/chat/ui/NewConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/NewConversationActivity.java
@@ -1,22 +1,20 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import de.gultsch.chat.R;
-import de.gultsch.chat.entities.Account;
-import de.gultsch.chat.entities.Contact;
-import de.gultsch.chat.entities.Conversation;
-import de.gultsch.chat.utils.UIHelper;
-import de.gultsch.chat.utils.Validator;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.entities.Contact;
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.utils.UIHelper;
+import eu.siacs.conversations.utils.Validator;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.ContactsContract;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -35,13 +33,9 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.CursorLoader;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
-import android.content.Loader;
-import android.content.Loader.OnLoadCompleteListener;
-import android.database.Cursor;
 
 public class NewConversationActivity extends XmppActivity {
 
diff --git a/src/de/gultsch/chat/ui/OnAccountListChangedListener.java b/src/eu/siacs/conversations/ui/OnAccountListChangedListener.java
index 4af5ac9b..98ef445e 100644
--- a/src/de/gultsch/chat/ui/OnAccountListChangedListener.java
+++ b/src/eu/siacs/conversations/ui/OnAccountListChangedListener.java
@@ -1,4 +1,4 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
 public interface OnAccountListChangedListener {
 	public void onAccountListChangedListener();
diff --git a/src/de/gultsch/chat/ui/OnConversationListChangedListener.java b/src/eu/siacs/conversations/ui/OnConversationListChangedListener.java
index 08b2bfb1..2a922e21 100644
--- a/src/de/gultsch/chat/ui/OnConversationListChangedListener.java
+++ b/src/eu/siacs/conversations/ui/OnConversationListChangedListener.java
@@ -1,4 +1,4 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
 public interface OnConversationListChangedListener {
 	public void onConversationListChanged();
diff --git a/src/de/gultsch/chat/ui/OnRosterFetchedListener.java b/src/eu/siacs/conversations/ui/OnRosterFetchedListener.java
index ad3f6592..d69ce35b 100644
--- a/src/de/gultsch/chat/ui/OnRosterFetchedListener.java
+++ b/src/eu/siacs/conversations/ui/OnRosterFetchedListener.java
@@ -1,7 +1,8 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
 import java.util.List;
-import de.gultsch.chat.entities.Contact;
+
+import eu.siacs.conversations.entities.Contact;
 
 public interface OnRosterFetchedListener {
 	public void onRosterFetched(List<Contact> roster);
diff --git a/src/de/gultsch/chat/ui/SettingsActivity.java b/src/eu/siacs/conversations/ui/SettingsActivity.java
index 886c05cc..abaf8c68 100644
--- a/src/de/gultsch/chat/ui/SettingsActivity.java
+++ b/src/eu/siacs/conversations/ui/SettingsActivity.java
@@ -1,4 +1,4 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/src/de/gultsch/chat/ui/SettingsFragment.java b/src/eu/siacs/conversations/ui/SettingsFragment.java
index 3ca4841a..7e1c3698 100644
--- a/src/de/gultsch/chat/ui/SettingsFragment.java
+++ b/src/eu/siacs/conversations/ui/SettingsFragment.java
@@ -1,6 +1,6 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
-import de.gultsch.chat.R;
+import eu.siacs.conversations.R;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
 
diff --git a/src/de/gultsch/chat/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java
index 66c92b72..5114e640 100644
--- a/src/de/gultsch/chat/ui/XmppActivity.java
+++ b/src/eu/siacs/conversations/ui/XmppActivity.java
@@ -1,7 +1,7 @@
-package de.gultsch.chat.ui;
+package eu.siacs.conversations.ui;
 
-import de.gultsch.chat.services.XmppConnectionService;
-import de.gultsch.chat.services.XmppConnectionService.XmppConnectionBinder;
+import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;