send messages in mucs are no longer displayed twice
This commit is contained in:
parent
c31101dd64
commit
4a963d6f50
|
@ -194,9 +194,9 @@ public class XmppConnectionService extends Service {
|
|||
}
|
||||
|
||||
public void sendMessage(final Account account, final Message message) {
|
||||
Log.d(LOGTAG, "sending message for " + account.getJid() + " to: "
|
||||
+ message.getCounterpart());
|
||||
databaseBackend.createMessage(message);
|
||||
if (message.getConversation().getMode()==Conversation.MODE_SINGLE) {
|
||||
databaseBackend.createMessage(message);
|
||||
}
|
||||
MessagePacket packet = new MessagePacket();
|
||||
if (message.getConversation().getMode() == Conversation.MODE_SINGLE) {
|
||||
packet.setType(MessagePacket.TYPE_CHAT);
|
||||
|
@ -208,8 +208,10 @@ public class XmppConnectionService extends Service {
|
|||
packet.setBody(message.getBody());
|
||||
if (account.getStatus()==Account.STATUS_ONLINE) {
|
||||
connections.get(account).sendMessagePacket(packet);
|
||||
message.setStatus(Message.STATUS_SEND);
|
||||
databaseBackend.updateMessage(message);
|
||||
if (message.getConversation().getMode()==Conversation.MODE_SINGLE) {
|
||||
message.setStatus(Message.STATUS_SEND);
|
||||
databaseBackend.updateMessage(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -56,10 +56,10 @@ public class ConversationFragment extends Fragment {
|
|||
Message message = new Message(conversation, chatMsg
|
||||
.getText().toString(), Message.ENCRYPTION_NONE);
|
||||
activity.xmppConnectionService.sendMessage(conversation.getAccount(),message);
|
||||
conversation.getMessages().add(message);
|
||||
chatMsg.setText("");
|
||||
|
||||
if (conversation.getMode()==Conversation.MODE_SINGLE) {
|
||||
conversation.getMessages().add(message);
|
||||
messageList.add(message);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue