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

Add a PEP PubSubManager to PEPManager

Browse source
This commit is contained in:
Florian Schmaus 2018-08-15 18:07:42 +02:00
parent 5569782113
commit 4b3f757ed9
7 changed files with 72 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

14
smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/AbstractOpenPgpIntegrationTest.java
View file

@ -37,6 +37,10 @@ public abstract class AbstractOpenPgpIntegrationTest extends AbstractSmackIntegr
protected final BareJid bob;
protected final BareJid chloe;
protected final PEPManager alicePepManager;
protected final PEPManager bobPepManager;
protected final PEPManager chloePepManager;
protected AbstractOpenPgpIntegrationTest(SmackIntegrationTestEnvironment environment)
throws XMPPException.XMPPErrorException, TestNotPossibleException, SmackException.NotConnectedException,
InterruptedException, SmackException.NoResponseException {
@ -54,9 +58,13 @@ public abstract class AbstractOpenPgpIntegrationTest extends AbstractSmackIntegr
this.bob = bobConnection.getUser().asBareJid();
this.chloe = chloeConnection.getUser().asBareJid();
OpenPgpPubSubUtil.deletePubkeysListNode(aliceConnection);
OpenPgpPubSubUtil.deletePubkeysListNode(bobConnection);
OpenPgpPubSubUtil.deletePubkeysListNode(chloeConnection);
this.alicePepManager = PEPManager.getInstanceFor(aliceConnection);
this.bobPepManager = PEPManager.getInstanceFor(bobConnection);
this.chloePepManager = PEPManager.getInstanceFor(chloeConnection);
OpenPgpPubSubUtil.deletePubkeysListNode(alicePepManager);
OpenPgpPubSubUtil.deletePubkeysListNode(bobPepManager);
OpenPgpPubSubUtil.deletePubkeysListNode(chloePepManager);
}
private static void throwIfPubSubNotSupported(XMPPConnection connection)

2
smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/OXSecretKeyBackupIntegrationTest.java
View file

@ -119,7 +119,7 @@ public class OXSecretKeyBackupIntegrationTest extends AbstractOpenPgpIntegration
public void cleanUp()
throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,
SmackException.NoResponseException {
OpenPgpPubSubUtil.deleteSecretKeyNode(aliceConnection);
OpenPgpPubSubUtil.deleteSecretKeyNode(alicePepManager);
if (openPgpManager != null) {
openPgpManager.stopMetadataListener();