aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-11-23 13:23:10 +0100
committerChristian Schneppe <christian@pix-art.de>2018-11-23 13:23:10 +0100
commit9d72ef6f32da0a1938735fef89d547a3750d4cdb (patch)
tree89920626cc8c4fb0b4e74b897d6c2f370c3f0ebf /src/main
parent24e5d84e4e3eb31d7460cc272f41eddc7d797668 (diff)
always do contact sync in background
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index faa924a8e..a86fc22e1 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -307,7 +307,7 @@ public class XmppConnectionService extends Service {
}
account.getRoster().clearPresences();
mJingleConnectionManager.cancelInTransmission();
- mQuickConversationsService.considerSync();
+ mQuickConversationsService.considerSyncBackground(false);
fetchRosterFromServer(account);
if (!account.getXmppConnection().getFeatures().bookmarksConversion()) {
fetchBookmarks(account);
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 4df1c8280..b1c3b6733 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -735,7 +735,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
@Override
protected void onBackendConnected() {
- xmppConnectionService.getQuickConversationsService().considerSync();
+ xmppConnectionService.getQuickConversationsService().considerSyncBackground(false);
if (mPostponedActivityResult != null) {
onActivityResult(mPostponedActivityResult.first, RESULT_OK, mPostponedActivityResult.second);
this.mPostponedActivityResult = null;