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

do not turn send button green unless history is caught up. fixes #1232

Browse source
This commit is contained in:
Daniel Gultsch 2017-05-19 13:39:44 +02:00
parent 7cd4ed78b2
commit 5a5eb5bdd3
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
View file

@ -102,6 +102,22 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
} }
} }
public boolean isCatchingUp(Conversation conversation) {
final Account account = conversation.getAccount();
if (account.getXmppConnection().isWaitingForSmCatchup()) {
return true;
} else {
synchronized (this.queries) {
for(Query query : this.queries) {
if (query.getAccount() == account && query.isCatchup() && ((conversation.getMode() == Conversation.MODE_SINGLE && query.getWith() == null) || query.getConversation() == conversation)) {
return true;
}
}
}
return false;
}
}
public Query query(final Conversation conversation, long end, boolean allowCatchup) { public Query query(final Conversation conversation, long end, boolean allowCatchup) {
return this.query(conversation,conversation.getLastMessageTransmitted(),end, allowCatchup); return this.query(conversation,conversation.getLastMessageTransmitted(),end, allowCatchup);
} }

7
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -1275,9 +1275,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
action = SendButtonAction.TEXT; action = SendButtonAction.TEXT;
} }
} }
if (activity.useSendButtonToIndicateStatus() && c != null if (activity.useSendButtonToIndicateStatus() && c.getAccount().getStatus() == Account.State.ONLINE) {
&& c.getAccount().getStatus() == Account.State.ONLINE) { if (activity.xmppConnectionService != null && activity.xmppConnectionService.getMessageArchiveService().isCatchingUp(c)) {
if (c.getMode() == Conversation.MODE_SINGLE) { status = Presence.Status.OFFLINE;
} else if (c.getMode() == Conversation.MODE_SINGLE) {
status = c.getContact().getShownStatus(); status = c.getContact().getShownStatus();
} else { } else {
status = c.getMucOptions().online() ? Presence.Status.ONLINE : Presence.Status.OFFLINE; status = c.getMucOptions().online() ? Presence.Status.ONLINE : Presence.Status.OFFLINE;