aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-09-13 20:37:27 +0200
committerChristian Schneppe <christian@pix-art.de>2019-09-13 20:37:27 +0200
commitb37741a0aed3062e5dceb099b7912f6304271ba8 (patch)
tree0c0c5e953abcc7acd1ef15eee38492bce9f43f53 /src/main/java
parent092beba1ba5f54c5cdfbc53cbc7eb70724bce8ca (diff)
stopped constantly focus shift if user is typing
fixes #386
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 9d2c7472b..924585ea4 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -2629,12 +2629,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
final MucOptions mucOptions = conversation.getMucOptions();
final List<MucOptions.User> allUsers = mucOptions.getUsers();
final Set<ReadByMarker> addedMarkers = new HashSet<>();
- ChatState state = ChatState.COMPOSING;
- List<MucOptions.User> users = conversation.getMucOptions().getUsersWithChatState(state, 5);
- if (users.size() == 0) {
- state = ChatState.PAUSED;
- users = conversation.getMucOptions().getUsersWithChatState(state, 5);
- }
if (mucOptions.isPrivateAndNonAnonymous()) {
for (int i = this.messageList.size() - 1; i >= 0; --i) {
final Set<ReadByMarker> markersForMessage = messageList.get(i).getReadByMarkers();
@@ -2643,7 +2637,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
if (!ReadByMarker.contains(marker, addedMarkers)) {
addedMarkers.add(marker); //may be put outside this condition. set should do dedup anyway
MucOptions.User user = mucOptions.findUser(marker);
- if (user != null && !users.contains(user)) {
+ if (user != null) {
shownMarkers.add(user);
}
}