From e157a3015f7e6d1a7846c9162cf22d861e0f30b7 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 6 Jul 2018 12:21:02 +0200 Subject: [PATCH] InterruptedException -> s/connection/thread --- .../smackx/ox/OXInstantMessagingManager.java | 6 +++--- .../smackx/ox/OpenPgpContact.java | 4 ++-- .../smackx/ox/OpenPgpManager.java | 10 +++++----- .../smackx/ox/util/PubSubDelegate.java | 20 +++++++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OXInstantMessagingManager.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OXInstantMessagingManager.java index e3d082c96..c2198f500 100644 --- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OXInstantMessagingManager.java +++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OXInstantMessagingManager.java @@ -95,7 +95,7 @@ public final class OXInstantMessagingManager extends Manager implements Signcryp * @return true if contact announces support, otherwise false. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error * @throws SmackException.NotConnectedException if we are not connected - * @throws InterruptedException if the connection gets interrupted + * @throws InterruptedException if the thread gets interrupted * @throws SmackException.NoResponseException if the server doesn't respond */ public boolean contactSupportsOxInstantMessaging(BareJid jid) @@ -111,7 +111,7 @@ public final class OXInstantMessagingManager extends Manager implements Signcryp * @return true if contact announces support, otherwise false. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error * @throws SmackException.NotConnectedException if we are not connected - * @throws InterruptedException if the connection is interrupted + * @throws InterruptedException if the thread is interrupted * @throws SmackException.NoResponseException if the server doesn't respond */ public boolean contactSupportsOxInstantMessaging(OpenPgpContact contact) @@ -152,7 +152,7 @@ public final class OXInstantMessagingManager extends Manager implements Signcryp * * @param contact contact capable of OpenPGP for XMPP: Instant Messaging. * @param body message body. - * @throws InterruptedException if the connection is interrupted + * @throws InterruptedException if the thread is interrupted * @throws MissingOpenPgpKeyPairException if we cannot access our signing key * @throws IOException IO is dangerous * @throws SmackException.NotConnectedException if we are not connected diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java index 70dde4bc7..e7a226d0d 100644 --- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java +++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java @@ -140,7 +140,7 @@ public class OpenPgpContact { /** * Fetch the metadata node to get a {@link PublicKeysListElement} and update any missing or outdated keys. * - * @throws InterruptedException if the connection is interrupted + * @throws InterruptedException if the thread is interrupted * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error * @throws SmackException in case of an error in Smack * @throws SmackOpenPgpException in case of an OpenPGP exception @@ -182,7 +182,7 @@ public class OpenPgpContact { * Update the key identified by the {@code fingerprint}. * * @param fingerprint fingerprint of the key - * @throws InterruptedException if the connection is interrupted + * @throws InterruptedException if the thread is interrupted * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error * @throws SmackException in case of an exception in Smack * @throws IOException IO is dangerous diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java index 77407cf76..a824df8fe 100644 --- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java +++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java @@ -163,7 +163,7 @@ public final class OpenPgpManager extends Manager { * @throws NoSuchAlgorithmException if we are missing an algorithm to generate a fresh key pair. * @throws NoSuchProviderException if we are missing a suitable {@link java.security.Provider}. * @throws SmackOpenPgpException if something bad happens during key generation/loading. - * @throws InterruptedException if the connection gets interrupted. + * @throws InterruptedException if the thread gets interrupted. * @throws PubSubException.NotALeafNodeException if one of the PubSub nodes is not a {@link LeafNode}. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. * @throws SmackException.NotConnectedException if we are not connected. @@ -272,7 +272,7 @@ public final class OpenPgpManager extends Manager { * @return true, if the server supports secret key backups, otherwise false. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. * @throws SmackException.NotConnectedException if we are not connected. - * @throws InterruptedException if the connection is interrupted. + * @throws InterruptedException if the thread is interrupted. * @throws SmackException.NoResponseException if the server doesn't respond. */ public static boolean serverSupportsSecretKeyBackups(XMPPConnection connection) @@ -289,7 +289,7 @@ public final class OpenPgpManager extends Manager { * * @param displayCodeCallback callback, which will receive the backup password used to encrypt the secret key. * @param selectKeyCallback callback, which will receive the users choice of which keys will be backed up. - * @throws InterruptedException if the connection is interrupted. + * @throws InterruptedException if the thread is interrupted. * @throws PubSubException.NotALeafNodeException if the private node is not a {@link LeafNode}. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. * @throws SmackException.NotConnectedException if we are not connected. @@ -325,7 +325,7 @@ public final class OpenPgpManager extends Manager { * * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. * @throws SmackException.NotConnectedException if we are not connected. - * @throws InterruptedException if the connection gets interrupted. + * @throws InterruptedException if the thread gets interrupted. * @throws SmackException.NoResponseException if the server doesn't respond. * @throws SmackException.NotLoggedInException if we are not logged in. */ @@ -344,7 +344,7 @@ public final class OpenPgpManager extends Manager { * * @return fingerprint of the restored secret key * - * @throws InterruptedException if the connection gets interrupted. + * @throws InterruptedException if the thread gets interrupted. * @throws PubSubException.NotALeafNodeException if the private node is not a {@link LeafNode}. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. * @throws SmackException.NotConnectedException if we are not connected. diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/PubSubDelegate.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/PubSubDelegate.java index 17623a1e6..9d7ff88d5 100644 --- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/PubSubDelegate.java +++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/PubSubDelegate.java @@ -92,7 +92,7 @@ public class PubSubDelegate { * @param accessModel new access model. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. * @throws SmackException.NotConnectedException if we are not connected. - * @throws InterruptedException if the connection is interrupted. + * @throws InterruptedException if the thread is interrupted. * @throws SmackException.NoResponseException if the server doesn't respond. */ public static void changeAccessModelIfNecessary(LeafNode node, AccessModel accessModel) @@ -115,7 +115,7 @@ public class PubSubDelegate { * @param fingerprint fingerprint of the public key * @see XEP-0373 ยง4.1 * - * @throws InterruptedException if the connection gets interrupted. + * @throws InterruptedException if the thread gets interrupted. * @throws PubSubException.NotALeafNodeException if either the metadata node or the public key node is not a * {@link LeafNode}. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. @@ -166,7 +166,7 @@ public class PubSubDelegate { * * @param connection XMPP connection * @return content of our metadata node. - * @throws InterruptedException if the connection gets interrupted. + * @throws InterruptedException if the thread gets interrupted. * @throws SmackException in case of an error in Smack. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol exception. */ @@ -184,7 +184,7 @@ public class PubSubDelegate { * @param connection XMPP connection * @param contact {@link BareJid} of the user we want to fetch the list from. * @return content of {@code contact}'s metadata node. - * @throws InterruptedException if the connection gets interrupted. + * @throws InterruptedException if the thread gets interrupted. * @throws SmackException in case of an exception in Smack. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol exception. */ @@ -209,7 +209,7 @@ public class PubSubDelegate { * @param connection XMPP connection * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. * @throws SmackException.NotConnectedException if we are not connected. - * @throws InterruptedException if the connection is interrupted. + * @throws InterruptedException if the thread is interrupted. * @throws SmackException.NoResponseException if the server doesn't respond. */ public static void deletePubkeysListNode(XMPPConnection connection) @@ -234,7 +234,7 @@ public class PubSubDelegate { * @param fingerprint fingerprint of the key we want to delete * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. * @throws SmackException.NotConnectedException if we are not connected. - * @throws InterruptedException if the connection gets interrupted. + * @throws InterruptedException if the thread gets interrupted. * @throws SmackException.NoResponseException if the server doesn't respond. */ public static void deletePublicKeyNode(XMPPConnection connection, OpenPgpV4Fingerprint fingerprint) @@ -263,7 +263,7 @@ public class PubSubDelegate { * @param v4_fingerprint upper case, hex encoded v4 fingerprint of the contacts key. * @return {@link PubkeyElement} containing the requested public key. * - * @throws InterruptedException if we get interrupted. + * @throws InterruptedException if the thread gets interrupted. * @throws SmackException in case the node cannot be fetched. * @throws XMPPException.XMPPErrorException in case of an XMPP protocol error. */ @@ -290,7 +290,7 @@ public class PubSubDelegate { * * @param connection {@link XMPPConnection} of the user * @param element a {@link SecretkeyElement} containing the encrypted secret key of the user - * @throws InterruptedException if the connection gets interrupted. + * @throws InterruptedException if the thread gets interrupted. * @throws PubSubException.NotALeafNodeException if something is wrong with the PubSub node * @throws XMPPException.XMPPErrorException in case of an protocol related error * @throws SmackException.NotConnectedException if we are not connected @@ -319,7 +319,7 @@ public class PubSubDelegate { * * @param connection {@link XMPPConnection} of the user. * @return the secret key node or null, if it doesn't exist. - * @throws InterruptedException if the connection gets interrupted + * @throws InterruptedException if the thread gets interrupted * @throws PubSubException.NotALeafNodeException if there is an issue with the PubSub node * @throws XMPPException.XMPPErrorException if there is an XMPP protocol related issue * @throws SmackException.NotConnectedException if we are not connected @@ -345,7 +345,7 @@ public class PubSubDelegate { * @param connection {@link XMPPConnection} of the user. * @throws XMPPException.XMPPErrorException if there is an XMPP protocol related issue * @throws SmackException.NotConnectedException if we are not connected - * @throws InterruptedException if the connection gets interrupted + * @throws InterruptedException if the thread gets interrupted * @throws SmackException.NoResponseException if the server sends no response */ public static void deleteSecretKeyNode(XMPPConnection connection)