diff options
| author | Christian S <christian@pix-art.de> | 2015-07-23 09:31:29 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-07-23 09:31:29 +0200 |
| commit | 98cc2023b1a57f6b8a3f605ff699fa624eed1bd6 (patch) | |
| tree | 57c8aeaf5e3d5942435b90eb8a568ebc37cdee7b /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 5ffeed8edb2ad89f942631b93472282313d1559b (diff) | |
| parent | cd204d5931a6cf0289d2df120f278864b8b94fdf (diff) | |
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index cccad16ad..842447c1f 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -385,11 +385,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa if (message.getStatus() <= Message.STATUS_RECEIVED) { if (message.getConversation().getMode() == Conversation.MODE_MULTI) { if (message.getCounterpart() != null) { - if (!message.getCounterpart().isBareJid()) { - highlightInConference(message.getCounterpart().getResourcepart()); - } else { - highlightInConference(message.getCounterpart().toString()); + String user = message.getCounterpart().isBareJid() ? message.getCounterpart().toString() : message.getCounterpart().getResourcepart(); + if (!message.getConversation().getMucOptions().isUserInRoom(user)) { + Toast.makeText(activity,activity.getString(R.string.user_has_left_conference,user),Toast.LENGTH_SHORT).show(); } + highlightInConference(user); } } else { activity.switchToContactDetails(message.getContact()); @@ -410,7 +410,14 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa if (message.getStatus() <= Message.STATUS_RECEIVED) { if (message.getConversation().getMode() == Conversation.MODE_MULTI) { if (message.getCounterpart() != null) { - privateMessageWith(message.getCounterpart()); + String user = message.getCounterpart().getResourcepart(); + if (user != null) { + if (message.getConversation().getMucOptions().isUserInRoom(user)) { + privateMessageWith(message.getCounterpart()); + } else { + Toast.makeText(activity, activity.getString(R.string.user_has_left_conference, user), Toast.LENGTH_SHORT).show(); + } + } } } } else { @@ -571,7 +578,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa private void downloadFile(Message message) { activity.xmppConnectionService.getHttpConnectionManager() - .createNewDownloadConnection(message); + .createNewDownloadConnection(message,true); } private void cancelTransmission(Message message) { |