From 1ac5be485502e7d6d4c117335e083c684739e6af Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sun, 31 Aug 2014 16:28:21 +0200 Subject: some code cleanup --- .../siacs/conversations/generator/IqGenerator.java | 50 +++++++++++----------- .../conversations/generator/MessageGenerator.java | 50 +++++++++++----------- .../conversations/generator/PresenceGenerator.java | 7 +-- 3 files changed, 56 insertions(+), 51 deletions(-) (limited to 'src/eu/siacs/conversations/generator') diff --git a/src/eu/siacs/conversations/generator/IqGenerator.java b/src/eu/siacs/conversations/generator/IqGenerator.java index 259538c2..b5ecafb5 100644 --- a/src/eu/siacs/conversations/generator/IqGenerator.java +++ b/src/eu/siacs/conversations/generator/IqGenerator.java @@ -10,67 +10,69 @@ import eu.siacs.conversations.xmpp.stanzas.IqPacket; public class IqGenerator extends AbstractGenerator { - - public IqPacket discoResponse(IqPacket request) { IqPacket packet = new IqPacket(IqPacket.TYPE_RESULT); packet.setId(request.getId()); packet.setTo(request.getFrom()); - Element query = packet.addChild("query","http://jabber.org/protocol/disco#info"); + Element query = packet.addChild("query", + "http://jabber.org/protocol/disco#info"); query.setAttribute("node", request.query().getAttribute("node")); Element identity = query.addChild("identity"); - identity.setAttribute("category","client"); + identity.setAttribute("category", "client"); identity.setAttribute("type", this.IDENTITY_TYPE); identity.setAttribute("name", IDENTITY_NAME); List features = Arrays.asList(FEATURES); Collections.sort(features); - for(String feature : features) { - query.addChild("feature").setAttribute("var",feature); + for (String feature : features) { + query.addChild("feature").setAttribute("var", feature); } return packet; } - + protected IqPacket publish(String node, Element item) { IqPacket packet = new IqPacket(IqPacket.TYPE_SET); - Element pubsub = packet.addChild("pubsub", "http://jabber.org/protocol/pubsub"); + Element pubsub = packet.addChild("pubsub", + "http://jabber.org/protocol/pubsub"); Element publish = pubsub.addChild("publish"); publish.setAttribute("node", node); publish.addChild(item); return packet; } - + protected IqPacket retrieve(String node, Element item) { IqPacket packet = new IqPacket(IqPacket.TYPE_GET); - Element pubsub = packet.addChild("pubsub", "http://jabber.org/protocol/pubsub"); - Element items = pubsub.addChild("items"); - items.setAttribute("node", node); - if (item!=null) { + Element pubsub = packet.addChild("pubsub", + "http://jabber.org/protocol/pubsub"); + Element items = pubsub.addChild("items"); + items.setAttribute("node", node); + if (item != null) { items.addChild(item); } return packet; } - + public IqPacket publishAvatar(Avatar avatar) { Element item = new Element("item"); item.setAttribute("id", avatar.sha1sum); - Element data = item.addChild("data","urn:xmpp:avatar:data"); + Element data = item.addChild("data", "urn:xmpp:avatar:data"); data.setContent(avatar.image); return publish("urn:xmpp:avatar:data", item); } - + public IqPacket publishAvatarMetadata(Avatar avatar) { Element item = new Element("item"); item.setAttribute("id", avatar.sha1sum); - Element metadata = item.addChild("metadata","urn:xmpp:avatar:metadata"); + Element metadata = item + .addChild("metadata", "urn:xmpp:avatar:metadata"); Element info = metadata.addChild("info"); - info.setAttribute("bytes",avatar.size); - info.setAttribute("id",avatar.sha1sum); - info.setAttribute("height",avatar.height); - info.setAttribute("width",avatar.height); + info.setAttribute("bytes", avatar.size); + info.setAttribute("id", avatar.sha1sum); + info.setAttribute("height", avatar.height); + info.setAttribute("width", avatar.height); info.setAttribute("type", avatar.type); - return publish("urn:xmpp:avatar:metadata",item); + return publish("urn:xmpp:avatar:metadata", item); } - + public IqPacket retrieveAvatar(Avatar avatar) { Element item = new Element("item"); item.setAttribute("id", avatar.sha1sum); @@ -81,7 +83,7 @@ public class IqGenerator extends AbstractGenerator { public IqPacket retrieveAvatarMetaData(String to) { IqPacket packet = retrieve("urn:xmpp:avatar:metadata", null); - if (to!=null) { + if (to != null) { packet.setTo(to); } return packet; diff --git a/src/eu/siacs/conversations/generator/MessageGenerator.java b/src/eu/siacs/conversations/generator/MessageGenerator.java index 26182aad..ea53432c 100644 --- a/src/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/eu/siacs/conversations/generator/MessageGenerator.java @@ -32,56 +32,56 @@ public class MessageGenerator { packet.setFrom(account.getFullJid()); packet.setId(message.getUuid()); if (addDelay) { - addDelay(packet,message.getTimeSent()); + addDelay(packet, message.getTimeSent()); } return packet; } - + private void addDelay(MessagePacket packet, long timestamp) { - final SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",Locale.US); + final SimpleDateFormat mDateFormat = new SimpleDateFormat( + "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US); mDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); Element delay = packet.addChild("delay", "urn:xmpp:delay"); Date date = new Date(timestamp); delay.setAttribute("stamp", mDateFormat.format(date)); } - + public MessagePacket generateOtrChat(Message message) { return generateOtrChat(message, false); } - + public MessagePacket generateOtrChat(Message message, boolean addDelay) { Session otrSession = message.getConversation().getOtrSession(); - if (otrSession==null) { + if (otrSession == null) { return null; } - MessagePacket packet = preparePacket(message,addDelay); + MessagePacket packet = preparePacket(message, addDelay); packet.addChild("private", "urn:xmpp:carbons:2"); packet.addChild("no-copy", "urn:xmpp:hints"); try { - packet.setBody(otrSession.transformSending(message - .getBody())); + packet.setBody(otrSession.transformSending(message.getBody())); return packet; } catch (OtrException e) { return null; } } - + public MessagePacket generateChat(Message message) { return generateChat(message, false); } - + public MessagePacket generateChat(Message message, boolean addDelay) { - MessagePacket packet = preparePacket(message,addDelay); + MessagePacket packet = preparePacket(message, addDelay); packet.setBody(message.getBody()); return packet; } - + public MessagePacket generatePgpChat(Message message) { return generatePgpChat(message, false); } - + public MessagePacket generatePgpChat(Message message, boolean addDelay) { - MessagePacket packet = preparePacket(message,addDelay); + MessagePacket packet = preparePacket(message, addDelay); packet.setBody("This is an XEP-0027 encryted message"); if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { packet.addChild("x", "jabber:x:encrypted").setContent( @@ -100,7 +100,7 @@ public class MessageGenerator { error.addChild("not-acceptable"); return packet; } - + private MessagePacket generateError(MessagePacket origin) { MessagePacket packet = new MessagePacket(); packet.setId(origin.getId()); @@ -109,7 +109,7 @@ public class MessageGenerator { packet.setType(MessagePacket.TYPE_ERROR); return packet; } - + public MessagePacket confirm(Account account, String to, String id) { MessagePacket packet = new MessagePacket(); packet.setType(MessagePacket.TYPE_NORMAL); @@ -120,8 +120,9 @@ public class MessageGenerator { received.setAttribute("id", id); return packet; } - - public MessagePacket conferenceSubject(Conversation conversation,String subject) { + + public MessagePacket conferenceSubject(Conversation conversation, + String subject) { MessagePacket packet = new MessagePacket(); packet.setType(MessagePacket.TYPE_GROUPCHAT); packet.setTo(conversation.getContactJid().split("/")[0]); @@ -131,7 +132,7 @@ public class MessageGenerator { packet.setFrom(conversation.getAccount().getJid()); return packet; } - + public MessagePacket directInvite(Conversation conversation, String contact) { MessagePacket packet = new MessagePacket(); packet.setType(MessagePacket.TYPE_NORMAL); @@ -141,7 +142,7 @@ public class MessageGenerator { x.setAttribute("jid", conversation.getContactJid().split("/")[0]); return packet; } - + public MessagePacket invite(Conversation conversation, String contact) { MessagePacket packet = new MessagePacket(); packet.setTo(conversation.getContactJid().split("/")[0]); @@ -154,13 +155,14 @@ public class MessageGenerator { packet.addChild(x); return packet; } - - public MessagePacket received(Account account, MessagePacket originalMessage, String namespace) { + + public MessagePacket received(Account account, + MessagePacket originalMessage, String namespace) { MessagePacket receivedPacket = new MessagePacket(); receivedPacket.setType(MessagePacket.TYPE_NORMAL); receivedPacket.setTo(originalMessage.getFrom()); receivedPacket.setFrom(account.getFullJid()); - Element received = receivedPacket.addChild("received",namespace); + Element received = receivedPacket.addChild("received", namespace); received.setAttribute("id", originalMessage.getId()); return receivedPacket; } diff --git a/src/eu/siacs/conversations/generator/PresenceGenerator.java b/src/eu/siacs/conversations/generator/PresenceGenerator.java index b3431568..87e361f5 100644 --- a/src/eu/siacs/conversations/generator/PresenceGenerator.java +++ b/src/eu/siacs/conversations/generator/PresenceGenerator.java @@ -14,7 +14,7 @@ public class PresenceGenerator extends AbstractGenerator { packet.setAttribute("from", contact.getAccount().getJid()); return packet; } - + public PresencePacket requestPresenceUpdatesFrom(Contact contact) { return subscription("subscribe", contact); } @@ -41,9 +41,10 @@ public class PresenceGenerator extends AbstractGenerator { } String capHash = getCapHash(); if (capHash != null) { - Element cap = packet.addChild("c","http://jabber.org/protocol/caps"); + Element cap = packet.addChild("c", + "http://jabber.org/protocol/caps"); cap.setAttribute("hash", "sha-1"); - cap.setAttribute("node","http://conversions.siacs.eu"); + cap.setAttribute("node", "http://conversions.siacs.eu"); cap.setAttribute("ver", capHash); } return packet; -- cgit v1.2.3