narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

send messages in mucs are no longer displayed twice

Browse source
This commit is contained in:
Daniel Gultsch 2014-02-09 01:00:23 +01:00
parent c31101dd64
commit 4a963d6f50
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/de/gultsch/chat/services/XmppConnectionService.java
View file

@ -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);
}
}
}

2
src/de/gultsch/chat/ui/ConversationFragment.java
View file

@ -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);
}