more workaroud for ejabberd bugs

2 files changed, 22 insertions, 2 deletions

diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index ff372460..b64fe5b2 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -18,6 +18,7 @@ import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.entities.MucOptions;
+import eu.siacs.conversations.entities.MucOptions.OnRenameListener;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.PhoneHelper;
 import eu.siacs.conversations.utils.UIHelper;
@@ -49,6 +50,7 @@ import android.widget.ListView;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 public class ConversationFragment extends Fragment {
 
@@ -351,6 +353,25 @@ public class ConversationFragment extends Fragment {
 					Message.ENCRYPTION_PGP);
 			sendPgpMessage(message);
 		}
+		if (conversation.getMode() == Conversation.MODE_MULTI) {
+			activity.xmppConnectionService.setOnRenameListener(new OnRenameListener() {
+				
+				@Override
+				public void onRename(final boolean success) {
+					getActivity().runOnUiThread(new Runnable() {
+						
+						@Override
+						public void run() {
+							if (success) {
+								Toast.makeText(getActivity(), "Your nickname has been changed",Toast.LENGTH_SHORT).show();
+							} else {
+								Toast.makeText(getActivity(), "Nichname is already in use",Toast.LENGTH_SHORT).show();
+							}
+						}
+					});
+				}
+			});
+		}
 	}
 
 	public void updateMessages() {
diff --git a/src/eu/siacs/conversations/ui/MucOptionsActivity.java b/src/eu/siacs/conversations/ui/MucOptionsActivity.java
index f5996345..4381eac4 100644
--- a/src/eu/siacs/conversations/ui/MucOptionsActivity.java
+++ b/src/eu/siacs/conversations/ui/MucOptionsActivity.java
@@ -20,7 +20,6 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.TextView;
 
 public class MucOptionsActivity extends XmppActivity {
@@ -44,7 +43,7 @@ public class MucOptionsActivity extends XmppActivity {
 			String nick = mYourNick.getText().toString();
 			if (!options.getNick().equals(nick)) {
 				Log.d("gultsch","call to change muc");
-				xmppConnectionService.renameInMuc(conversation, nick, activity);
+				xmppConnectionService.renameInMuc(conversation, nick);
 				finish();
 			}
 		}