store bookmarks in pep if conversion xep is running
This commit is contained in:
parent
46574d6e11
commit
dc5e7e5d95
|
@ -36,6 +36,7 @@ public abstract class AbstractGenerator {
|
|||
"http://jabber.org/protocol/disco#info",
|
||||
"urn:xmpp:avatar:metadata+notify",
|
||||
"http://jabber.org/protocol/nick+notify",
|
||||
Namespace.BOOKMARKS+"+notify",
|
||||
"urn:xmpp:ping",
|
||||
"jabber:iq:version",
|
||||
"http://jabber.org/protocol/chatstates"
|
||||
|
@ -50,20 +51,17 @@ public abstract class AbstractGenerator {
|
|||
private final String[] PRIVACY_SENSITIVE = {
|
||||
"urn:xmpp:time" //XEP-0202: Entity Time leaks time zone
|
||||
};
|
||||
private final String[] OTR = {
|
||||
"urn:xmpp:otr:0"
|
||||
};
|
||||
private String mVersion = null;
|
||||
|
||||
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
|
||||
|
||||
protected XmppConnectionService mXmppConnectionService;
|
||||
|
||||
protected AbstractGenerator(XmppConnectionService service) {
|
||||
AbstractGenerator(XmppConnectionService service) {
|
||||
this.mXmppConnectionService = service;
|
||||
}
|
||||
|
||||
protected String getIdentityVersion() {
|
||||
String getIdentityVersion() {
|
||||
if (mVersion == null) {
|
||||
this.mVersion = PhoneHelper.getVersionName(mXmppConnectionService);
|
||||
}
|
||||
|
|
|
@ -24,6 +24,7 @@ import eu.siacs.conversations.Config;
|
|||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Bookmark;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.entities.DownloadableFile;
|
||||
import eu.siacs.conversations.services.MessageArchiveService;
|
||||
|
@ -138,6 +139,13 @@ public class IqGenerator extends AbstractGenerator {
|
|||
return publish("urn:xmpp:avatar:data", item);
|
||||
}
|
||||
|
||||
public IqPacket publishElement(final String namespace,final Element element, final Bundle options) {
|
||||
final Element item = new Element("item");
|
||||
item.setAttribute("id","current");
|
||||
item.addChild(element);
|
||||
return publish(namespace, item, options);
|
||||
}
|
||||
|
||||
public IqPacket publishAvatarMetadata(final Avatar avatar) {
|
||||
final Element item = new Element("item");
|
||||
item.setAttribute("id", avatar.sha1sum);
|
||||
|
|
|
@ -212,6 +212,13 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
|
|||
AxolotlService axolotlService = account.getAxolotlService();
|
||||
axolotlService.registerDevices(from, deviceIds);
|
||||
mXmppConnectionService.updateAccountUi();
|
||||
} else if (Namespace.BOOKMARKS.equals(node)) {
|
||||
Log.d(Config.LOGTAG,"received bookmarks from "+from);
|
||||
if (account.getJid().asBareJid().equals(from)) {
|
||||
final Element i = items.findChild("item");
|
||||
final Element storage = i == null ? null : i.findChild("storage", Namespace.BOOKMARKS);
|
||||
mXmppConnectionService.processBookmarks(account,storage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -219,7 +226,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
|
|||
if (packet.getType() == MessagePacket.TYPE_ERROR) {
|
||||
Jid from = packet.getFrom();
|
||||
if (from != null) {
|
||||
Message message = mXmppConnectionService.markMessage(account,
|
||||
mXmppConnectionService.markMessage(account,
|
||||
from.asBareJid(),
|
||||
packet.getId(),
|
||||
Message.STATUS_SEND_FAILED,
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -20,4 +20,6 @@ public final class Namespace {
|
|||
public static final String FLEXIBLE_OFFLINE_MESSAGE_RETRIEVAL = "http://jabber.org/protocol/offline";
|
||||
public static final String BIND = "urn:ietf:params:xml:ns:xmpp-bind";
|
||||
public static final String P1_S3_FILE_TRANSFER = "p1:s3filetransfer";
|
||||
public static final String BOOKMARKS_CONVERSION = "urn:xmpp:bookmarks-conversion:0";
|
||||
public static final String BOOKMARKS = "storage:bookmarks";
|
||||
}
|
||||
|
|
|
@ -1754,6 +1754,10 @@ public class XmppConnection implements Runnable {
|
|||
return hasDiscoFeature(Jid.of(account.getServer()), "urn:xmpp:carbons:2");
|
||||
}
|
||||
|
||||
public boolean bookmarksConversion() {
|
||||
return hasDiscoFeature(account.getJid().asBareJid(),Namespace.BOOKMARKS_CONVERSION) && pepPublishOptions();
|
||||
}
|
||||
|
||||
public boolean blocking() {
|
||||
return hasDiscoFeature(Jid.of(account.getServer()), Namespace.BLOCKING);
|
||||
}
|
||||
|
|
|
@ -14,4 +14,11 @@ public class PublishOptions {
|
|||
return options;
|
||||
}
|
||||
|
||||
public static Bundle persistentWhitelistAccess() {
|
||||
final Bundle options = new Bundle();
|
||||
options.putString("pubsub#persist_items","true");
|
||||
options.putString("pubsub#access_model","whitelist");
|
||||
return options;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue