vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-08 03:51:09 +01:00
Code Issues Releases Wiki Activity

Rebase on master

Browse source
This commit is contained in:
Paul Schaub 2018-06-09 14:29:18 +02:00
parent 19a91794c6
commit ce5b5f88ef
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
18 changed files with 117 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractOmemoMessageListener.java
View file

@ -43,7 +43,7 @@ public class AbstractOmemoMessageListener implements OmemoMessageListener {
private static class SyncPointListener extends AbstractOmemoMessageListener {
protected final ResultSyncPoint<?,?> syncPoint;
public SyncPointListener(ResultSyncPoint<?,?> syncPoint) {
SyncPointListener(ResultSyncPoint<?,?> syncPoint) {
this.syncPoint = syncPoint;
}

18
smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java
View file

@ -60,8 +60,7 @@ public class OmemoManagerSetupHelper {
final XMPPConnection target,
String targetNick,
String[] targetGroups)
throws Exception
{
throws Exception {
final SimpleResultSyncPoint subscribed = new SimpleResultSyncPoint();
Roster subscriberRoster = Roster.getInstanceFor(subscriber);
@ -194,16 +193,14 @@ public class OmemoManagerSetupHelper {
pm.getLeafNode(OmemoConstants.PEP_NODE_BUNDLE_FROM_DEVICE_ID(id)).deleteAllItems();
} catch (InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException |
PubSubException.NotALeafNodeException | XMPPException.XMPPErrorException |
PubSubException.NotAPubSubNodeException e)
{
PubSubException.NotAPubSubNodeException e) {
// Silent
}
try {
pm.deleteNode(OmemoConstants.PEP_NODE_BUNDLE_FROM_DEVICE_ID(id));
} catch (SmackException.NoResponseException | InterruptedException | SmackException.NotConnectedException
| XMPPException.XMPPErrorException e)
{
| XMPPException.XMPPErrorException e) {
// Silent
}
}
@ -212,16 +209,14 @@ public class OmemoManagerSetupHelper {
pm.getLeafNode(OmemoConstants.PEP_NODE_DEVICE_LIST).deleteAllItems();
} catch (InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException |
PubSubException.NotALeafNodeException | XMPPException.XMPPErrorException |
PubSubException.NotAPubSubNodeException e)
{
PubSubException.NotAPubSubNodeException e) {
// Silent
}
try {
pm.deleteNode(OmemoConstants.PEP_NODE_DEVICE_LIST);
} catch (SmackException.NoResponseException | InterruptedException | SmackException.NotConnectedException |
XMPPException.XMPPErrorException e)
{
XMPPException.XMPPErrorException e) {
// Silent
}
}
@ -232,8 +227,7 @@ public class OmemoManagerSetupHelper {
try {
roster.removeEntry(r);
} catch (InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException |
XMPPException.XMPPErrorException | SmackException.NotLoggedInException e)
{
XMPPException.XMPPErrorException | SmackException.NotLoggedInException e) {
// Silent
}
}