vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 00:59:39 +02:00
Code Issues Releases Wiki Activity

Introduce XmlEnvironment

Browse source
This commit is contained in:
Florian Schmaus 2019-02-04 13:27:41 +01:00
parent dc780ffd6c
commit fee3ed81ca
229 changed files with 715 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/CryptElement.java
View file

@ -46,7 +46,7 @@ public class CryptElement extends EncryptedOpenPgpContentElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this).rightAngleBracket();
addCommonXml(xml);
xml.closeElement(this);

2
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpContentElement.java
View file

@ -183,7 +183,7 @@ public abstract class OpenPgpContentElement implements ExtensionElement {
* @return InputStream over xml.
*/
public InputStream toInputStream() {
byte[] encoded = toXML(null).toString().getBytes(Charset.forName("UTF-8"));
byte[] encoded = toXML().toString().getBytes(Charset.forName("UTF-8"));
return new ByteArrayInputStream(encoded);
}
}

2
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpElement.java
View file

@ -70,7 +70,7 @@ public class OpenPgpElement implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.rightAngleBracket().append(base64EncodedOpenPgpMessage).closeElement(this);
return xml;

4
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/PubkeyElement.java
View file

@ -73,7 +73,7 @@ public class PubkeyElement implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this)
.optAttribute(ATTR_DATE, date)
.rightAngleBracket()
@ -110,7 +110,7 @@ public class PubkeyElement implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this)
.rightAngleBracket()
.append(new String(b64Data, Charset.forName("UTF-8")))

4
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/PublicKeysListElement.java
View file

@ -64,7 +64,7 @@ public final class PublicKeysListElement implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this).rightAngleBracket();
for (PubkeyMetadataElement metadataElement : metadata.values()) {
xml.element(metadataElement);
@ -124,7 +124,7 @@ public final class PublicKeysListElement implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this)
.attribute(ATTR_V4_FINGERPRINT, getV4Fingerprint())
.attribute(ATTR_DATE, date).closeEmptyElement();

2
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/SecretkeyElement.java
View file

@ -54,7 +54,7 @@ public class SecretkeyElement implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this)
.rightAngleBracket()
.append(new String(b64Data, Charset.forName("UTF-8")))

2
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/SignElement.java
View file

@ -45,7 +45,7 @@ public class SignElement extends OpenPgpContentElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this).rightAngleBracket();
addCommonXml(xml);
xml.closeElement(this);

2
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/SigncryptElement.java
View file

@ -49,7 +49,7 @@ public class SigncryptElement extends EncryptedOpenPgpContentElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this).rightAngleBracket();
addCommonXml(xml);
xml.closeElement(this);

8
smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java
View file

@ -70,7 +70,7 @@ public class OpenPgpElementTest extends SmackTestSuite {
OpenPgpElement element = new OpenPgpElement("BASE64_OPENPGP_MESSAGE");
assertXMLEqual(expected, element.toXML(null).toString());
assertXMLEqual(expected, element.toXML().toString());
XmlPullParser parser = TestUtils.getParser(expected);
OpenPgpElement parsed = OpenPgpElementProvider.TEST_INSTANCE.parse(parser);
@ -102,7 +102,7 @@ public class OpenPgpElementTest extends SmackTestSuite {
payload.add(new Message.Body("en", "Hello World!"));
SignElement element = new SignElement(recipients, testDate, payload);
assertXMLEqual(expected, element.toXML(null).toString());
assertXMLEqual(expected, element.toXML().toString());
XmlPullParser parser = TestUtils.getParser(expected);
SignElement parsed = (SignElement) OpenPgpContentElementProvider.parseOpenPgpContentElement(parser);
@ -132,7 +132,7 @@ public class OpenPgpElementTest extends SmackTestSuite {
testDate,
payload);
assertXMLEqual(expected, element.toXML(null).toString());
assertXMLEqual(expected, element.toXML().toString());
XmlPullParser parser = TestUtils.getParser(expected);
CryptElement parsed = (CryptElement) OpenPgpContentElementProvider.parseOpenPgpContentElement(parser);
@ -162,7 +162,7 @@ public class OpenPgpElementTest extends SmackTestSuite {
"f0rm1l4n4-mT8y33j!Y%fRSrcd^ZE4Q7VDt1L%WEgR!kv",
testDate, payload);
assertXMLEqual(expected, element.toXML(null).toString());
assertXMLEqual(expected, element.toXML().toString());
XmlPullParser parser = TestUtils.getParser(expected);
SigncryptElement parsed = (SigncryptElement) OpenPgpContentElementProvider.parseOpenPgpContentElement(parser);

2
smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubkeyElementTest.java
View file

@ -48,7 +48,7 @@ public class PubkeyElementTest extends SmackTestSuite {
byte[] key = "BASE64_OPENPGP_PUBLIC_KEY".getBytes(Charset.forName("UTF-8"));
PubkeyElement element = new PubkeyElement(new PubkeyElement.PubkeyDataElement(key), date);
assertXMLEqual(expected, element.toXML(null).toString());
assertXMLEqual(expected, element.toXML().toString());
XmlPullParser parser = TestUtils.getParser(expected);
PubkeyElement parsed = PubkeyElementProvider.TEST_INSTANCE.parse(parser);

2
smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PublicKeysListElementTest.java
View file

@ -62,7 +62,7 @@ public class PublicKeysListElementTest extends SmackTestSuite {
.addMetadata(child2)
.build();
assertXMLEqual(expected, element.toXML(null).toString());
assertXMLEqual(expected, element.toXML().toString());
XmlPullParser parser = TestUtils.getParser(expected);
PublicKeysListElement parsed = PublicKeysListElementProvider.TEST_INSTANCE.parse(parser);

2
smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretkeyElementTest.java
View file

@ -42,7 +42,7 @@ public class SecretkeyElementTest extends SmackTestSuite {
SecretkeyElement element = new SecretkeyElement(key);
assertXMLEqual(expected, element.toXML(null).toString());
assertXMLEqual(expected, element.toXML().toString());
XmlPullParser parser = TestUtils.getParser(expected);
SecretkeyElement parsed = SecretkeyElementProvider.TEST_INSTANCE.parse(parser);