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

wait for DB restore before bind

Browse source
This commit is contained in:
Daniel Gultsch 2022-09-26 09:47:53 +02:00
parent 3d56d01826
commit cb775ece99
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1939,7 +1939,7 @@ public class XmppConnectionService extends Service {
databaseBackend.expireOldMessages(deletionDate);
}
Log.d(Config.LOGTAG, "restoring roster...");
for (Account account : accounts) {
for (final Account account : accounts) {
databaseBackend.readRoster(account.getRoster());
account.initAccountServices(XmppConnectionService.this); //roster needs to be loaded at this stage
}
@ -1977,11 +1977,11 @@ public class XmppConnectionService extends Service {
public void loadPhoneContacts() {
mContactMergerExecutor.execute(() -> {
Map<Jid, JabberIdContact> contacts = JabberIdContact.load(this);
final Map<Jid, JabberIdContact> contacts = JabberIdContact.load(this);
Log.d(Config.LOGTAG, "start merging phone contacts with roster");
for (Account account : accounts) {
List<Contact> withSystemAccounts = account.getRoster().getWithSystemAccounts(JabberIdContact.class);
for (JabberIdContact jidContact : contacts.values()) {
for (final Account account : accounts) {
final List<Contact> withSystemAccounts = account.getRoster().getWithSystemAccounts(JabberIdContact.class);
for (final JabberIdContact jidContact : contacts.values()) {
final Contact contact = account.getRoster().getContact(jidContact.getJid());
boolean needsCacheClean = contact.setPhoneContact(jidContact);
if (needsCacheClean) {
@ -1989,7 +1989,7 @@ public class XmppConnectionService extends Service {
}
withSystemAccounts.remove(contact);
}
for (Contact contact : withSystemAccounts) {
for (final Contact contact : withSystemAccounts) {
boolean needsCacheClean = contact.unsetPhoneContact(JabberIdContact.class);
if (needsCacheClean) {
getAvatarService().clear(contact);

23
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -753,6 +753,7 @@ public class XmppConnection implements Runnable {
processFailed(failed, false); // wait for new stream features
}
if (bound != null) {
clearIqCallbacks();
this.isBound = true;
final Element streamManagementEnabled =
bound.findChild("enabled", Namespace.STREAM_MANAGEMENT);
@ -1134,7 +1135,12 @@ public class XmppConnection implements Runnable {
tagReader.setInputStream(sslSocket.getInputStream());
tagWriter.setOutputStream(sslSocket.getOutputStream());
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": TLS connection established");
final boolean quickStart = establishStream(true);
final boolean quickStart;
try {
quickStart = establishStream(true);
} catch (final InterruptedException e) {
return;
}
if (quickStart) {
this.quickStartInProgress = true;
}
@ -1333,6 +1339,17 @@ public class XmppConnection implements Runnable {
sm
&& bindFeatures != null
&& bindFeatures.containsAll(Bind2.QUICKSTART_FEATURES);
if (bindFeatures != null) {
try {
mXmppConnectionService.restoredFromDatabaseLatch.await();
} catch (final InterruptedException e) {
Log.d(
Config.LOGTAG,
account.getJid().asBareJid()
+ ": interrupted while waiting for DB restore during SASL2 bind");
return;
}
}
authenticate = generateAuthenticationRequest(firstMessage, bindFeatures, sm);
} else {
throw new AssertionError("Missing implementation for " + version);
@ -1876,7 +1893,6 @@ public class XmppConnection implements Runnable {
}
}
}
Log.d(Config.LOGTAG, commands.toString());
synchronized (this.commands) {
this.commands.clear();
this.commands.putAll(commands);
@ -2018,12 +2034,13 @@ public class XmppConnection implements Runnable {
}
}
private boolean establishStream(final boolean secureConnection) throws IOException {
private boolean establishStream(final boolean secureConnection) throws IOException, InterruptedException {
final SaslMechanism saslMechanism = account.getPinnedMechanism();
if (secureConnection
&& Config.SASL_2_ENABLED
&& saslMechanism != null
&& account.isOptionSet(Account.OPTION_QUICKSTART_AVAILABLE)) {
mXmppConnectionService.restoredFromDatabaseLatch.await();
this.saslMechanism = saslMechanism;
final Element authenticate =
generateAuthenticationRequest(saslMechanism.getClientFirstMessage());