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

hrukudah #15

Closed
bodqhrohro wants to merge 30 commits from hrukudah into master
pull from: hrukudah
merge into: narayana:master
Conversation 0 Commits 30 Files changed 54 +3 -1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 07c730098e - Show all commits

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

@ -2500,8 +2500,10 @@ public class XmppConnectionService extends Service {
query.setCallback(callback); query.setCallback(callback);
callback.informUser(R.string.fetching_history_from_server); callback.informUser(R.string.fetching_history_from_server);
} else { } else {
if (conversation.getMode() != Conversational.MODE_SINGLE || !conversation.hasPermanentCounterpart()) {
callback.informUser(R.string.not_fetching_history_retention_period); callback.informUser(R.string.not_fetching_history_retention_period);
} }
}
} }
} }