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

set noMessagesLeftOnServer before conference configuration fetch

Browse source
This commit is contained in:
Daniel Gultsch 2016-02-23 16:15:55 +01:00
parent 34f2a63190
commit 17b1fcc3ea
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -1772,6 +1772,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
account.pendingConferenceLeaves.remove(conversation); account.pendingConferenceLeaves.remove(conversation);
if (account.getStatus() == Account.State.ONLINE) { if (account.getStatus() == Account.State.ONLINE) {
conversation.resetMucOptions(); conversation.resetMucOptions();
conversation.setHasMessagesLeftOnServer(false);
fetchConferenceConfiguration(conversation, new OnConferenceConfigurationFetched() { fetchConferenceConfiguration(conversation, new OnConferenceConfigurationFetched() {
private void join(Conversation conversation) { private void join(Conversation conversation) {
@ -1806,7 +1807,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
conversation.setContactJid(joinJid); conversation.setContactJid(joinJid);
databaseBackend.updateConversation(conversation); databaseBackend.updateConversation(conversation);
} }
conversation.setHasMessagesLeftOnServer(false);
if (conversation.getMucOptions().mamSupport()) { if (conversation.getMucOptions().mamSupport()) {
getMessageArchiveService().catchupMUC(conversation); getMessageArchiveService().catchupMUC(conversation);
} }
@ -1828,6 +1828,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} else { } else {
account.pendingConferenceJoins.add(conversation); account.pendingConferenceJoins.add(conversation);
conversation.resetMucOptions(); conversation.resetMucOptions();
conversation.setHasMessagesLeftOnServer(false);
updateConversationUi(); updateConversationUi();
} }
} }

1
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
View file

@ -14,7 +14,6 @@ import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds; import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Intents; import android.provider.ContactsContract.Intents;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;