cogentleman/xmpp_client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

synchronize join/leaves with bookmarks

Browse Source
This commit is contained in:
Daniel Gultsch 2018-12-15 17:44:23 +01:00
parent b4cd31520d
commit 76b78be2f2
3 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -218,7 +218,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
if (account.getXmppConnection().getFeatures().bookmarksConversion()) { if (account.getXmppConnection().getFeatures().bookmarksConversion()) {
final Element i = items.findChild("item"); final Element i = items.findChild("item");
final Element storage = i == null ? null : i.findChild("storage", Namespace.BOOKMARKS); final Element storage = i == null ? null : i.findChild("storage", Namespace.BOOKMARKS);
mXmppConnectionService.processBookmarks(account, storage); mXmppConnectionService.processBookmarks(account, storage, true);
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": processing bookmark PEP event"); Log.d(Config.LOGTAG,account.getJid().asBareJid()+": processing bookmark PEP event");
} else { } else {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": ignoring bookmark PEP event because bookmark conversion was not detected"); Log.d(Config.LOGTAG,account.getJid().asBareJid()+": ignoring bookmark PEP event because bookmark conversion was not detected");

36
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1401,7 +1401,7 @@ public class XmppConnectionService extends Service {
if (response.getType() == IqPacket.TYPE.RESULT) { if (response.getType() == IqPacket.TYPE.RESULT) {
final Element query1 = response.query(); final Element query1 = response.query();
final Element storage = query1.findChild("storage", "storage:bookmarks"); final Element storage = query1.findChild("storage", "storage:bookmarks");
processBookmarks(a, storage); processBookmarks(a, storage, false);
} else { } else {
Log.d(Config.LOGTAG, a.getJid().asBareJid() + ": could not fetch bookmarks"); Log.d(Config.LOGTAG, a.getJid().asBareJid() + ": could not fetch bookmarks");
} }
@ -1409,9 +1409,9 @@ public class XmppConnectionService extends Service {
sendIqPacket(account, iqPacket, callback); sendIqPacket(account, iqPacket, callback);
} }
public void processBookmarks(Account account, Element storage) { public void processBookmarks(Account account, Element storage, final boolean pep) {
final HashMap<Jid, Bookmark> bookmarks = new HashMap<>(); final HashMap<Jid, Bookmark> bookmarks = new HashMap<>();
final boolean autojoin = respectAutojoin(); final boolean synchronizeWithBookmarks = synchronizeWithBookmarks();
if (storage != null) { if (storage != null) {
for (final Element item : storage.getChildren()) { for (final Element item : storage.getChildren()) {
if (item.getName().equals("conference")) { if (item.getName().equals("conference")) {
@ -1420,10 +1420,20 @@ public class XmppConnectionService extends Service {
if (old != null && old.getBookmarkName() != null && bookmark.getBookmarkName() == null) { if (old != null && old.getBookmarkName() != null && bookmark.getBookmarkName() == null) {
bookmark.setBookmarkName(old.getBookmarkName()); bookmark.setBookmarkName(old.getBookmarkName());
} }
if (bookmark.getJid() == null) {
continue;
}
Conversation conversation = find(bookmark); Conversation conversation = find(bookmark);
if (conversation != null) { if (conversation != null) {
if (conversation.getMode() != Conversation.MODE_MULTI) {
continue;
}
bookmark.setConversation(conversation); bookmark.setConversation(conversation);
} else if (bookmark.autojoin() && bookmark.getJid() != null && autojoin) { if (pep && synchronizeWithBookmarks && !bookmark.autojoin()) {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": archiving conference ("+conversation.getJid()+") after receiving pep");
archiveConversation(conversation, false);
}
} else if (synchronizeWithBookmarks && bookmark.autojoin()) {
conversation = findOrCreateConversation(account, bookmark.getFullJid(), true, true, false); conversation = findOrCreateConversation(account, bookmark.getFullJid(), true, true, false);
bookmark.setConversation(conversation); bookmark.setConversation(conversation);
} }
@ -1831,6 +1841,10 @@ public class XmppConnectionService extends Service {
} }
public void archiveConversation(Conversation conversation) { public void archiveConversation(Conversation conversation) {
archiveConversation(conversation, true);
}
private void archiveConversation(Conversation conversation, final boolean maySyncronizeWithBookmarks) {
getNotificationService().clear(conversation); getNotificationService().clear(conversation);
conversation.setStatus(Conversation.STATUS_ARCHIVED); conversation.setStatus(Conversation.STATUS_ARCHIVED);
conversation.setNextMessage(null); conversation.setNextMessage(null);
@ -1839,7 +1853,7 @@ public class XmppConnectionService extends Service {
if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getMode() == Conversation.MODE_MULTI) {
if (conversation.getAccount().getStatus() == Account.State.ONLINE) { if (conversation.getAccount().getStatus() == Account.State.ONLINE) {
Bookmark bookmark = conversation.getBookmark(); Bookmark bookmark = conversation.getBookmark();
if (bookmark != null && bookmark.autojoin() && respectAutojoin()) { if (maySyncronizeWithBookmarks && bookmark != null && bookmark.autojoin() && synchronizeWithBookmarks()) {
bookmark.setAutojoin(false); bookmark.setAutojoin(false);
pushBookmarks(bookmark.getAccount()); pushBookmarks(bookmark.getAccount());
} }
@ -2342,11 +2356,19 @@ public class XmppConnectionService extends Service {
@Override @Override
public void onConferenceConfigurationFetched(Conversation conversation) { public void onConferenceConfigurationFetched(Conversation conversation) {
if (conversation.getStatus() == Conversation.STATUS_ARCHIVED) {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": conversation ("+conversation.getJid()+") got archived before IQ result");
return;
}
join(conversation); join(conversation);
} }
@Override @Override
public void onFetchFailed(final Conversation conversation, Element error) { public void onFetchFailed(final Conversation conversation, Element error) {
if (conversation.getStatus() == Conversation.STATUS_ARCHIVED) {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": conversation ("+conversation.getJid()+") got archived before IQ result");
return;
}
if (error != null && "remote-server-not-found".equals(error.getName())) { if (error != null && "remote-server-not-found".equals(error.getName())) {
conversation.getMucOptions().setError(MucOptions.Error.SERVER_NOT_FOUND); conversation.getMucOptions().setError(MucOptions.Error.SERVER_NOT_FOUND);
updateConversationUi(); updateConversationUi();
@ -2434,7 +2456,7 @@ public class XmppConnectionService extends Service {
if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getMode() == Conversation.MODE_MULTI) {
conversation.getMucOptions().setPassword(password); conversation.getMucOptions().setPassword(password);
if (conversation.getBookmark() != null) { if (conversation.getBookmark() != null) {
if (respectAutojoin()) { if (synchronizeWithBookmarks()) {
conversation.getBookmark().setAutojoin(true); conversation.getBookmark().setAutojoin(true);
} }
pushBookmarks(conversation.getAccount()); pushBookmarks(conversation.getAccount());
@ -3411,7 +3433,7 @@ public class XmppConnectionService extends Service {
return getBooleanPreference("chat_states", R.bool.chat_states); return getBooleanPreference("chat_states", R.bool.chat_states);
} }
private boolean respectAutojoin() { private boolean synchronizeWithBookmarks() {
return getBooleanPreference("autojoin", R.bool.autojoin); return getBooleanPreference("autojoin", R.bool.autojoin);
} }

4
src/main/res/values/strings.xml
View File

@ -279,8 +279,8 @@
<string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string> <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string>
<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string> <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
<string name="pref_expert_options_other">Other</string> <string name="pref_expert_options_other">Other</string>
<string name="pref_autojoin">Automatically join group chats</string> <string name="pref_autojoin">Synchronize with bookmarks</string>
<string name="pref_autojoin_summary">Respect the autojoin flag in group chat bookmarks</string> <string name="pref_autojoin_summary">Join and leave group chats according to auto-join flag in your bookmarks.</string>
<string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string> <string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string>
<string name="conference_banned">You are banned from this group chat</string> <string name="conference_banned">You are banned from this group chat</string>
<string name="conference_members_only">This group chat is members only</string> <string name="conference_members_only">This group chat is members only</string>