Browse Source

s/occured/occurred/

nicktest
Florian Schmaus 4 months ago
parent
commit
eb4c2c5572
50 changed files with 196 additions and 196 deletions
  1. +5
    -5
      resources/fix-a-javadoc.sh
  2. +6
    -6
      smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
  3. +4
    -4
      smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
  4. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/compression/Java7ZlibInputOutputStream.java
  5. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
  6. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java
  7. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
  8. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/util/FileUtils.java
  9. +23
    -23
      smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
  10. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
  11. +4
    -4
      smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java
  12. +1
    -1
      smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java
  13. +3
    -3
      smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventManagerTest.java
  14. +4
    -4
      smack-extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeManagerTest.java
  15. +3
    -3
      smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java
  16. +2
    -2
      smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java
  17. +3
    -3
      smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java
  18. +3
    -3
      smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java
  19. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java
  20. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
  21. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
  22. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java
  23. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
  24. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
  25. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
  26. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
  27. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
  28. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
  29. +10
    -10
      smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
  30. +2
    -2
      smack-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
  31. +1
    -1
      smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java
  32. +1
    -1
      smack-integration-test/src/main/java/org/jivesoftware/smack/LoginIntegrationTest.java
  33. +6
    -6
      smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java
  34. +1
    -1
      smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java
  35. +1
    -1
      smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java
  36. +2
    -2
      smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java
  37. +2
    -2
      smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java
  38. +2
    -2
      smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
  39. +2
    -2
      smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
  40. +2
    -2
      smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
  41. +2
    -2
      smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
  42. +2
    -2
      smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
  43. +2
    -2
      smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
  44. +1
    -1
      smack-omemo-signal/src/test/java/org/jivesoftware/smackx/omemo/SignalOmemoStoreTest.java
  45. +15
    -15
      smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
  46. +2
    -2
      smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoRatchet.java
  47. +20
    -20
      smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
  48. +34
    -34
      smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java
  49. +1
    -1
      smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java
  50. +3
    -3
      smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java

+ 5
- 5
resources/fix-a-javadoc.sh View File

@@ -28,17 +28,17 @@ SMACK_EXCEPTIONS[InterruptedException]="if the calling thread was interrupted."
SMACK_EXCEPTIONS[XMPPErrorException]="if there was an XMPP error returned."
SMACK_EXCEPTIONS[NoResponseException]="if there was no response from the remote entity."
SMACK_EXCEPTIONS[NotLoggedInException]="if the XMPP connection is not authenticated."
SMACK_EXCEPTIONS[BOSHException]="if an BOSH related error occured."
SMACK_EXCEPTIONS[IOException]="if an I/O error occured."
SMACK_EXCEPTIONS[BOSHException]="if an BOSH related error occurred."
SMACK_EXCEPTIONS[IOException]="if an I/O error occurred."
SMACK_EXCEPTIONS[SmackException]="if Smack detected an exceptional situation."
SMACK_EXCEPTIONS[XMPPException]="if an XMPP protocol error was received."
SMACK_EXCEPTIONS[SmackSaslException]="if a SASL specific error occured."
SMACK_EXCEPTIONS[SmackSaslException]="if a SASL specific error occurred."
SMACK_EXCEPTIONS[SASLErrorException]="if a SASL protocol error was returned."
SMACK_EXCEPTIONS[NotAMucServiceException]="if the entity is not a MUC serivce."
SMACK_EXCEPTIONS[NoSuchAlgorithmException]="if no such algorithm is available."
SMACK_EXCEPTIONS[KeyManagementException]="if there was a key mangement error."
SMACK_EXCEPTIONS[XmppStringprepException]="if the provided string is invalid."
SMACK_EXCEPTIONS[XmlPullParserException]="if an error in the XML parser occured."
SMACK_EXCEPTIONS[XmlPullParserException]="if an error in the XML parser occurred."
SMACK_EXCEPTIONS[SmackParsingException]="if the Smack parser (provider) encountered invalid input."
SMACK_EXCEPTIONS[MucNotJoinedException]="if not joined to the Multi-User Chat."
SMACK_EXCEPTIONS[MucAlreadyJoinedException]="if already joined the Multi-User Chat."7y
@@ -54,7 +54,7 @@ SMACK_EXCEPTIONS[IllegalArgumentException]="if an illegal argument was given."
SMACK_EXCEPTIONS[NotAPubSubNodeException]="if a involved node is not a PubSub node."
SMACK_EXCEPTIONS[NoAcceptableTransferMechanisms]="if no acceptable transfer mechanisms are available"
SMACK_EXCEPTIONS[NoSuchMethodException]="if no such method is declared"
SMACK_EXCEPTIONS[Exception]="if an exception occured."
SMACK_EXCEPTIONS[Exception]="if an exception occurred."
SMACK_EXCEPTIONS[TestNotPossibleException]="if the test is not possible."
SMACK_EXCEPTIONS[TimeoutException]="if there was a timeout."
SMACK_EXCEPTIONS[IllegalStateException]="if an illegal state was encountered"


+ 6
- 6
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java View File

@@ -535,7 +535,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
*
* @throws XMPPException if an error occurs on the XMPP protocol level.
* @throws SmackException if an error occurs somewhere else besides XMPP protocol level.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @return a reference to this object, to chain <code>connect()</code> with <code>login()</code>.
* @throws InterruptedException if the calling thread was interrupted.
*/
@@ -575,7 +575,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
* login if the previous connection state was logged (authenticated).
*
* @throws SmackException if Smack detected an exceptional situation.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws XMPPException if an XMPP protocol error was received.
* @throws InterruptedException if the calling thread was interrupted.
*/
@@ -628,7 +628,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
* @param password TODO javadoc me please
* @throws XMPPException if an XMPP protocol error was received.
* @throws SmackException if Smack detected an exceptional situation.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws InterruptedException if the calling thread was interrupted.
* @see #login
*/
@@ -646,7 +646,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
* @param resource TODO javadoc me please
* @throws XMPPException if an XMPP protocol error was received.
* @throws SmackException if Smack detected an exceptional situation.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws InterruptedException if the calling thread was interrupted.
* @see #login
*/
@@ -873,9 +873,9 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
* @return the used SASLMechanism.
* @throws XMPPErrorException if there was an XMPP error returned.
* @throws SASLErrorException if a SASL protocol error was returned.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackSaslException if a SASL specific error occured.
* @throws SmackSaslException if a SASL specific error occurred.
* @throws NotConnectedException if the XMPP connection is not connected.
* @throws NoResponseException if there was no response from the remote entity.
* @throws SmackWrappedException in case of an exception.


+ 4
- 4
smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java View File

@@ -175,9 +175,9 @@ public final class SASLAuthentication {
* @return the used SASLMechanism.
* @throws XMPPErrorException if there was an XMPP error returned.
* @throws SASLErrorException if a SASL protocol error was returned.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackSaslException if a SASL specific error occured.
* @throws SmackSaslException if a SASL specific error occurred.
* @throws NotConnectedException if the XMPP connection is not connected.
* @throws NoResponseException if there was no response from the remote entity.
*/
@@ -233,7 +233,7 @@ public final class SASLAuthentication {
*
* @param challenge a base64 encoded string representing the challenge.
* @param finalChallenge true if this is the last challenge send by the server within the success stanza
* @throws SmackSaslException if a SASL specific error occured.
* @throws SmackSaslException if a SASL specific error occurred.
* @throws NotConnectedException if the XMPP connection is not connected.
* @throws InterruptedException if the calling thread was interrupted.
*/
@@ -252,7 +252,7 @@ public final class SASLAuthentication {
* @throws SmackException if Smack detected an exceptional situation.
* @throws InterruptedException if the calling thread was interrupted.
* @throws NotConnectedException if the XMPP connection is not connected.
* @throws SmackSaslException if a SASL specific error occured.
* @throws SmackSaslException if a SASL specific error occurred.
*/
void authenticated(Success success) throws InterruptedException, SmackSaslException, NotConnectedException {
// RFC6120 6.3.10 "At the end of the authentication exchange, the SASL server (the XMPP


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/compression/Java7ZlibInputOutputStream.java View File

@@ -76,7 +76,7 @@ public class Java7ZlibInputOutputStream extends XMPPInputOutputStream {
* byte without blocking, 0 means that the system is known to block for more input.
*
* @return 0 if no data is available, 1 otherwise
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@Override
public int available() throws IOException {


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java View File

@@ -39,7 +39,7 @@ public interface ParsingExceptionCallback {
* Called when parsing a stanza caused an exception.
*
* @param stanzaData the raw stanza data that caused the exception
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
void handleUnparsableStanza(UnparseableStanza stanzaData) throws IOException;



+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java View File

@@ -222,7 +222,7 @@ public abstract class SASLMechanism implements Comparable<SASLMechanism> {
* empty array here.
*
* @return the initial response or null
* @throws SmackSaslException if a SASL specific error occured.
* @throws SmackSaslException if a SASL specific error occurred.
*/
protected abstract byte[] getAuthenticationText() throws SmackSaslException;



+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java View File

@@ -259,7 +259,7 @@ public abstract class ScramMechanism extends SASLMechanism {
/**
*
* @return the Channel Binding data.
* @throws SmackSaslException if a SASL specific error occured.
* @throws SmackSaslException if a SASL specific error occurred.
*/
protected byte[] getChannelBindingData() throws SmackSaslException {
return null;


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/util/FileUtils.java View File

@@ -110,7 +110,7 @@ public final class FileUtils {
*
* @param file TODO javadoc me please
* @return the content of file or null in case of an error
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@SuppressWarnings("DefaultCharset")
public static String readFileOrThrow(File file) throws IOException {


+ 23
- 23
smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java View File

@@ -106,9 +106,9 @@ public class PacketParserUtils {
* @param parser TODO javadoc me please
* @param outerXmlEnvironment the outer XML environment (optional).
* @return a stanza which is either a Message, IQ or Presence.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws SmackParsingException if the Smack parser (provider) encountered invalid input.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public static Stanza parseStanza(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws XmlPullParserException, SmackParsingException, IOException {
ParserUtils.assertAtStartTag(parser);
@@ -156,8 +156,8 @@ public class PacketParserUtils {
* @param parser the XML parser, positioned at the start of a message packet.
* @param outerXmlEnvironment the outer XML environment (optional).
* @return a Message packet.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws IOException if an I/O error occurred.
* @throws SmackParsingException if the Smack parser (provider) encountered invalid input.
*/
public static Message parseMessage(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws XmlPullParserException, IOException, SmackParsingException {
@@ -238,8 +238,8 @@ public class PacketParserUtils {
*
* @param parser TODO javadoc me please
* @return the textual content of the element as String
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws IOException if an I/O error occurred.
*/
public static String parseElementText(XmlPullParser parser) throws XmlPullParserException, IOException {
assert parser.getEventType() == XmlPullParser.Event.START_ELEMENT;
@@ -277,8 +277,8 @@ public class PacketParserUtils {
*
* @param parser the XML pull parser
* @return the element as string
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws IOException if an I/O error occurred.
*/
public static CharSequence parseElement(XmlPullParser parser) throws XmlPullParserException, IOException {
return parseElement(parser, false);
@@ -316,8 +316,8 @@ public class PacketParserUtils {
* @param depth TODO javadoc me please
* @param fullNamespaces TODO javadoc me please
* @return the content of the current depth
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws IOException if an I/O error occurred.
*/
public static CharSequence parseContentDepth(XmlPullParser parser, int depth, boolean fullNamespaces) throws XmlPullParserException, IOException {
if (parser.supportsRoundtrip()) {
@@ -442,8 +442,8 @@ public class PacketParserUtils {
* @param parser the XML parser, positioned at the start of a presence packet.
* @param outerXmlEnvironment the outer XML environment (optional).
* @return a Presence packet.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws SmackParsingException if the Smack parser (provider) encountered invalid input.
*/
public static Presence parsePresence(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws XmlPullParserException, IOException, SmackParsingException {
@@ -530,9 +530,9 @@ public class PacketParserUtils {
* @param parser the XML parser, positioned at the start of an IQ packet.
* @param outerXmlEnvironment the outer XML environment (optional).
* @return an IQ object.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws XmppStringprepException if the provided string is invalid.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws SmackParsingException if the Smack parser (provider) encountered invalid input.
*/
public static IQ parseIQ(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws XmlPullParserException, XmppStringprepException, IOException, SmackParsingException {
@@ -622,8 +622,8 @@ public class PacketParserUtils {
*
* @param parser the XML parser, positioned at the start of the mechanisms stanza.
* @return a collection of Stings with the mechanisms included in the mechanisms stanza.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
public static Collection<String> parseMechanisms(XmlPullParser parser)
throws XmlPullParserException, IOException {
@@ -652,7 +652,7 @@ public class PacketParserUtils {
*
* @param parser the XML parser, positioned at the start of the compression stanza.
* @return The CompressionFeature stream element
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an exception occurs while parsing the stanza.
*/
public static Compress.Feature parseCompressionFeature(XmlPullParser parser)
@@ -719,8 +719,8 @@ public class PacketParserUtils {
* @param parser the XML parser.
* @param outerXmlEnvironment the outer XML environment (optional).
* @return an stream error packet.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws SmackParsingException if the Smack parser (provider) encountered invalid input.
*/
public static StreamError parseStreamError(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws XmlPullParserException, IOException, SmackParsingException {
@@ -781,8 +781,8 @@ public class PacketParserUtils {
* @param parser the XML parser.
* @param outerXmlEnvironment the outer XML environment (optional).
* @return an error sub-packet.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws SmackParsingException if the Smack parser (provider) encountered invalid input.
*/
public static StanzaError parseError(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws XmlPullParserException, IOException, SmackParsingException {
@@ -845,8 +845,8 @@ public class PacketParserUtils {
* @param outerXmlEnvironment the outer XML environment (optional).
*
* @return an extension element.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws IOException if an I/O error occurred.
* @throws SmackParsingException if the Smack parser (provider) encountered invalid input.
*/
public static ExtensionElement parseExtensionElement(String elementName, String namespace,


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java View File

@@ -628,7 +628,7 @@ public class XmlStringBuilder implements Appendable, CharSequence, Element {
*
* @param writer TODO javadoc me please
* @param enclosingXmlEnvironment the enclosing XML environment.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public void write(Writer writer, XmlEnvironment enclosingXmlEnvironment) throws IOException {
try {


+ 4
- 4
smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java View File

@@ -55,8 +55,8 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
*
* @param parser parser
* @return HeadersExtension or null if no headers
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws IOException if an I/O error occurred.
* @throws SmackParsingException if the Smack parser (provider) encountered invalid input.
*/
protected HeadersExtension parseHeaders(XmlPullParser parser) throws IOException, XmlPullParserException, SmackParsingException {
@@ -76,8 +76,8 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
* @param parser parser
* @return Data or null if no data
*
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws IOException if an I/O error occurred.
*/
protected AbstractHttpOverXmpp.Data parseData(XmlPullParser parser) throws XmlPullParserException, IOException {
NamedElement child = null;


+ 1
- 1
smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java View File

@@ -251,7 +251,7 @@ public final class HttpFileUploadManager extends Manager {
* @throws InterruptedException if the calling thread was interrupted.
* @throws XMPPException.XMPPErrorException if there was an XMPP error returned.
* @throws SmackException if Smack detected an exceptional situation.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public URL uploadFile(File file, UploadProgressListener listener) throws InterruptedException,
XMPPException.XMPPErrorException, SmackException, IOException {


+ 3
- 3
smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventManagerTest.java View File

@@ -58,7 +58,7 @@ public class MessageEventManagerTest extends SmackTestCase {
try {
chat1.sendMessage(msg);
} catch (Exception e) {
fail("An error occured sending the message");
fail("An error occurred sending the message");
}
}

@@ -113,7 +113,7 @@ public class MessageEventManagerTest extends SmackTestCase {
// Wait a few seconds so that the XMPP client can send any event
Thread.sleep(200);
} catch (Exception e) {
fail("An error occured sending the message");
fail("An error occurred sending the message");
}
}

@@ -229,7 +229,7 @@ public class MessageEventManagerTest extends SmackTestCase {
results.containsAll(resultsExpected));

} catch (Exception e) {
fail("An error occured sending the message");
fail("An error occurred sending the message");
}
}



+ 4
- 4
smack-extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeManagerTest.java View File

@@ -56,7 +56,7 @@ public class RosterExchangeManagerTest extends SmackTestCase {
}
catch (Exception e) {
e.printStackTrace();
fail("An error occured sending the roster");
fail("An error occurred sending the roster");
}
}

@@ -76,7 +76,7 @@ public class RosterExchangeManagerTest extends SmackTestCase {
}
catch (Exception e) {
e.printStackTrace();
fail("An error occured sending the roster");
fail("An error occurred sending the roster");
}
}

@@ -121,7 +121,7 @@ public class RosterExchangeManagerTest extends SmackTestCase {
}
}
catch (Exception e) {
fail("An error occured sending the message with the roster");
fail("An error occurred sending the message with the roster");
}
assertEquals(
"Number of sent and received entries does not match",
@@ -179,7 +179,7 @@ public class RosterExchangeManagerTest extends SmackTestCase {
}
}
catch (Exception e) {
fail("An error occured sending the message with the roster");
fail("An error occurred sending the message with the roster");
}
assertEquals(
"Number of sent and received entries does not match",


+ 3
- 3
smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java View File

@@ -75,7 +75,7 @@ public class XHTMLManagerTest extends SmackTestCase {
chat1.sendMessage(msg);
Thread.sleep(200);
} catch (Exception e) {
fail("An error occured sending the message with XHTML");
fail("An error occurred sending the message with XHTML");
}
}

@@ -116,7 +116,7 @@ public class XHTMLManagerTest extends SmackTestCase {
try {
chat1.sendMessage(msg);
} catch (Exception e) {
fail("An error occured sending the message with XHTML");
fail("An error occurred sending the message with XHTML");
}

Packet packet = chat2.nextResult(2000);
@@ -197,7 +197,7 @@ public class XHTMLManagerTest extends SmackTestCase {
bodiesReceived = 0;
chat1.sendMessage(msg);
} catch (Exception e) {
fail("An error occured sending the message with XHTML");
fail("An error occurred sending the message with XHTML");
}

Packet packet = chat2.nextResult(2000);


+ 2
- 2
smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java View File

@@ -64,7 +64,7 @@ public class MessageEventTest extends SmackTestCase {
Thread.sleep(200);
}
catch (Exception e) {
fail("An error occured sending the message");
fail("An error occurred sending the message");
}
}

@@ -122,7 +122,7 @@ public class MessageEventTest extends SmackTestCase {
Thread.sleep(200);
}
catch (Exception e) {
fail("An error occured sending the message");
fail("An error occurred sending the message");
}
}



+ 3
- 3
smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java View File

@@ -58,7 +58,7 @@ public class RosterExchangeTest extends SmackTestCase {
try {
chat1.sendMessage(msg);
} catch (Exception e) {
fail("An error occured sending the message with the roster");
fail("An error occurred sending the message with the roster");
}
}

@@ -87,7 +87,7 @@ public class RosterExchangeTest extends SmackTestCase {
try {
chat1.sendMessage(msg);
} catch (Exception e) {
fail("An error occured sending the message with the roster");
fail("An error occurred sending the message with the roster");
}
// Wait for 2 seconds for a reply
Packet packet = chat2.nextResult(2000);
@@ -131,7 +131,7 @@ public class RosterExchangeTest extends SmackTestCase {
try {
chat1.sendMessage(msg);
} catch (Exception e) {
fail("An error occured sending the message with the roster");
fail("An error occurred sending the message with the roster");
}
// Wait for 10 seconds for a reply
Packet packet = chat2.nextResult(5000);


+ 3
- 3
smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java View File

@@ -68,7 +68,7 @@ public class XHTMLExtensionTest extends SmackTestCase {
Thread.sleep(200);
}
catch (Exception e) {
fail("An error occured sending the message with XHTML");
fail("An error occurred sending the message with XHTML");
}
}

@@ -101,7 +101,7 @@ public class XHTMLExtensionTest extends SmackTestCase {
chat1.sendMessage(msg);
}
catch (Exception e) {
fail("An error occured sending the message with XHTML");
fail("An error occurred sending the message with XHTML");
}
Packet packet = chat2.nextResult(2000);
Message message = (Message) packet;
@@ -172,7 +172,7 @@ public class XHTMLExtensionTest extends SmackTestCase {
chat1.sendMessage(msg);
}
catch (Exception e) {
fail("An error occured sending the message with XHTML");
fail("An error occurred sending the message with XHTML");
}
Packet packet = chat2.nextResult(2000);
int received = 0;


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java View File

@@ -38,8 +38,8 @@ public class AMPExtensionProvider extends ExtensionElementProvider<AMPExtension>
*
* @param parser the XML parser, positioned at the starting element of the extension.
* @return a PacketExtension.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public AMPExtension parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java View File

@@ -130,7 +130,7 @@ public class Socks5Client {
* supported by the Socks5Client.
*
* @param socket connected to a SOCKS5 proxy
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws SmackMessageException if there was an error.
*/
protected void establish(Socket socket) throws IOException, SmackMessageException {


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java View File

@@ -127,7 +127,7 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache
*
* @param file TODO javadoc me please
* @param info TODO javadoc me please
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private static void writeInfoToFile(File file, DiscoverInfo info) throws IOException {
try (DataOutputStream dos = new DataOutputStream(new FileOutputStream(file))) {


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java View File

@@ -110,7 +110,7 @@ public class IncomingFileTransfer extends FileTransfer {
*
* @param file The location to save the file.
* @throws SmackException when the file transfer fails
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws IllegalArgumentException This exception is thrown when the the provided file is
* either null, or cannot be written to.
*/


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java View File

@@ -229,7 +229,7 @@ public final class LastActivityManager extends Manager {
* the JID of the user.
* @return the LastActivity stanza of the jid.
* @throws XMPPErrorException if there was an XMPP error returned.
* thrown if a server error has occured.
* thrown if a server error has occurred.
* @throws NoResponseException if there was no response from the server.
* @throws NotConnectedException if the XMPP connection is not connected.
* @throws InterruptedException if the calling thread was interrupted.


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java View File

@@ -41,8 +41,8 @@ public interface PrivateDataProvider {
*
* @param parser an XML parser.
* @return a new PrivateData instance.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws IOException if an I/O error occurred.
*/
PrivateData parsePrivateData(XmlPullParser parser) throws XmlPullParserException, IOException;
}

+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java View File

@@ -48,8 +48,8 @@ public class JivePropertiesExtensionProvider extends ExtensionElementProvider<Ji
*
* @param parser the XML parser, positioned at the start of a properties sub-packet.
* @return a map of the properties.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public JivePropertiesExtension parse(XmlPullParser parser,


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java View File

@@ -1897,7 +1897,7 @@ public class MultiUserChat {
*
* @param role the role of the occupant in the room.
* @return a list of <code>Occupant</code> that have the specified room role.
* @throws XMPPErrorException if an error occured while performing the request to the server or you
* @throws XMPPErrorException if an error occurred while performing the request to the server or you
* don't have enough privileges to get this information.
* @throws NoResponseException if there was no response from the server.
* @throws NotConnectedException if the XMPP connection is not connected.


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java View File

@@ -43,8 +43,8 @@ public class MUCUserProvider extends ExtensionElementProvider<MUCUser> {
*
* @param parser the XML parser, positioned at the starting element of the extension.
* @return a PacketExtension.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public MUCUser parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java View File

@@ -99,8 +99,8 @@ public class OfflineMessageInfo implements ExtensionElement {
*
* @param parser the XML parser, positioned at the starting element of the extension.
* @return a PacketExtension.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public OfflineMessageInfo parse(XmlPullParser parser,


+ 10
- 10
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java View File

@@ -135,7 +135,7 @@ public class Socks5ByteStreamManagerTest {
* @throws XMPPException if an XMPP protocol error was received.
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@Test
public void shouldFailIfTargetDoesNotSupportSocks5()
@@ -163,7 +163,7 @@ public class Socks5ByteStreamManagerTest {
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@Test
public void shouldFailIfNoSocks5ProxyFound1()
@@ -215,7 +215,7 @@ public class Socks5ByteStreamManagerTest {
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@Test
public void shouldFailIfNoSocks5ProxyFound2()
@@ -277,7 +277,7 @@ public class Socks5ByteStreamManagerTest {
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@Test
public void shouldBlacklistNonSocks5Proxies() throws SmackException, InterruptedException, IOException, XMPPException {
@@ -360,7 +360,7 @@ public class Socks5ByteStreamManagerTest {
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@Test
public void shouldFailIfTargetDoesNotAcceptSocks5Bytestream() throws SmackException, InterruptedException, IOException, XMPPException {
@@ -440,7 +440,7 @@ public class Socks5ByteStreamManagerTest {
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@Test
public void shouldFailIfTargetUsesInvalidSocks5Proxy()
@@ -622,7 +622,7 @@ public class Socks5ByteStreamManagerTest {
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@Test
public void shouldNegotiateSocks5BytestreamAndTransferData()
@@ -741,7 +741,7 @@ public class Socks5ByteStreamManagerTest {
*
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws XMPPException if an XMPP protocol error was received.
* @throws TimeoutException if there was a timeout.
*/
@@ -848,7 +848,7 @@ public class Socks5ByteStreamManagerTest {
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*
*/
@Test
@@ -934,7 +934,7 @@ public class Socks5ByteStreamManagerTest {
* should successfully negotiate a SOCKS5 Bytestream via the second SOCKS5 proxy. The second
* negotiation should run in the same manner if prioritization is disabled.
*
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException if Smack detected an exceptional situation.
* @throws XMPPException if an XMPP protocol error was received.


+ 2
- 2
smack-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java View File

@@ -99,7 +99,7 @@ public class PingTest extends InitExtensions {
* DummyConnection will not reply so it will timeout.
* @throws SmackException if Smack detected an exceptional situation.
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws InterruptedException if the calling thread was interrupted.
*/
@Test
@@ -239,7 +239,7 @@ public class PingTest extends InitExtensions {
*
* @return
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws SmackException if Smack detected an exceptional situation.
* @throws InterruptedException if the calling thread was interrupted.
*/


+ 1
- 1
smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java View File

@@ -165,7 +165,7 @@ public class RosterGroup extends Manager {
* to receive the updated roster.
*
* @param entry a roster entry.
* @throws XMPPErrorException if an error occured while trying to add the entry to the group.
* @throws XMPPErrorException if an error occurred while trying to add the entry to the group.
* @throws NoResponseException if there was no response from the server.
* @throws NotConnectedException if the XMPP connection is not connected.
* @throws InterruptedException if the calling thread was interrupted.


+ 1
- 1
smack-integration-test/src/main/java/org/jivesoftware/smack/LoginIntegrationTest.java View File

@@ -43,7 +43,7 @@ public class LoginIntegrationTest extends AbstractSmackLowLevelIntegrationTest {
*
* @throws InterruptedException if the calling thread was interrupted.
* @throws XMPPException if an XMPP protocol error was received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws SmackException if Smack detected an exceptional situation.
* @throws NoSuchAlgorithmException if no such algorithm is available.
* @throws KeyManagementException if there was a key mangement error.


+ 6
- 6
smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java View File

@@ -234,7 +234,7 @@ public class JingleManagerTest extends SmackTestCase {

} catch (Exception e) {
LOGGER.log(Level.WARNING, "exception", e);
fail("An error occured with Jingle");
fail("An error occurred with Jingle");
}
}

@@ -294,7 +294,7 @@ public class JingleManagerTest extends SmackTestCase {

} catch (Exception e) {
LOGGER.log(Level.WARNING, "exception", e);
fail("An error occured with Jingle");
fail("An error occurred with Jingle");
}
}

@@ -385,7 +385,7 @@ public class JingleManagerTest extends SmackTestCase {

} catch (Exception e) {
LOGGER.log(Level.WARNING, "exception", e);
fail("An error occured with Jingle");
fail("An error occurred with Jingle");
}
}

@@ -499,7 +499,7 @@ public class JingleManagerTest extends SmackTestCase {

} catch (Exception e) {
LOGGER.log(Level.WARNING, "exception", e);
fail("An error occured with Jingle");
fail("An error occurred with Jingle");
}
}

@@ -589,7 +589,7 @@ public class JingleManagerTest extends SmackTestCase {

} catch (Exception e) {
LOGGER.log(Level.WARNING, "exception", e);
fail("An error occured with Jingle");
fail("An error occurred with Jingle");
}
}

@@ -985,7 +985,7 @@ public class JingleManagerTest extends SmackTestCase {
//
// } catch (Exception e) {
// LOGGER.log(Level.WARNING, "exception", e);
// fail("An error occured with Jingle");
// fail("An error occurred with Jingle");
// }
// }



+ 1
- 1
smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java View File

@@ -396,7 +396,7 @@ public class STUNResolverTest extends SmackTestCase {

} catch (Exception e) {
LOGGER.log(Level.WARNING, "exception", e);
fail("An error occured with Jingle");
fail("An error occurred with Jingle");
}
}



+ 1
- 1
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java View File

@@ -70,7 +70,7 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio
* @return MediaSession TODO javadoc me please
* @throws NoProcessorException if there is no media processor.
* @throws UnsupportedFormatException if the format is not supported.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws GeneralSecurityException if there was a geneeral security exception.
*/
public static MediaSession createSession(String localhost, int localPort, String remoteHost, int remotePort, MediaSessionListener eventHandler, int quality, boolean secure, boolean micOn) throws NoProcessorException, UnsupportedFormatException, IOException, GeneralSecurityException {


+ 2
- 2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java View File

@@ -65,8 +65,8 @@ public abstract class JingleContentDescriptionProvider extends ExtensionElementP
*
* @param parser the input to parse
* @return a description element
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public JingleContentDescription parse(XmlPullParser parser,


+ 2
- 2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java View File

@@ -66,8 +66,8 @@ public abstract class JingleDescriptionProvider extends ExtensionElementProvider
* @param parser TODO javadoc me please
* the input to parse
* @return a description element
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public JingleDescription parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {


+ 2
- 2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java View File

@@ -45,8 +45,8 @@ public class JingleProvider extends IQProvider<Jingle> {

/**
* Parse a iq/jingle element.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occurred.
* @throws IOException if an I/O error occurred.
* @throws SmackParsingException if the Smack parser (provider) encountered invalid input.
*/
@Override


+ 2
- 2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java View File

@@ -49,8 +49,8 @@ public abstract class JingleTransportProvider extends ExtensionElementProvider<J
*
* @param parser the structure to parse
* @return a transport element.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public JingleTransport parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {


+ 2
- 2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java View File

@@ -38,8 +38,8 @@ public class MetaDataProvider extends ExtensionElementProvider<MetaData> {

/**
* PacketExtensionProvider implementation.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public MetaData parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {


+ 2
- 2
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java View File

@@ -79,8 +79,8 @@ public class WorkgroupInformation implements ExtensionElement {

/**
* PacketExtensionProvider implementation.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public WorkgroupInformation parse(XmlPullParser parser,


+ 2
- 2
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java View File

@@ -39,8 +39,8 @@ public class MessageEventProvider extends ExtensionElementProvider<MessageEvent>
*
* @param parser the XML parser, positioned at the starting element of the extension.
* @return a PacketExtension.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public MessageEvent parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)


+ 2
- 2
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java View File

@@ -44,8 +44,8 @@ public class RosterExchangeProvider extends ExtensionElementProvider<RosterExcha
*
* @param parser the XML parser, positioned at the starting element of the extension.
* @return a PacketExtension.
* @throws IOException if an I/O error occured.
* @throws XmlPullParserException if an error in the XML parser occured.
* @throws IOException if an I/O error occurred.
* @throws XmlPullParserException if an error in the XML parser occurred.
*/
@Override
public RosterExchange parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)


+ 1
- 1
smack-omemo-signal/src/test/java/org/jivesoftware/smackx/omemo/SignalOmemoStoreTest.java View File

@@ -61,7 +61,7 @@ public class SignalOmemoStoreTest extends OmemoStoreTest<IdentityKeyPair, Identi
/**
* We are running this Test with multiple available OmemoStore implementations.
* @return
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
@Parameterized.Parameters
public static Collection<Object[]> getParameters() throws IOException {


+ 15
- 15
smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java View File

@@ -235,7 +235,7 @@ public final class OmemoManager extends Manager {
* @throws XMPPException.XMPPErrorException if there was an XMPP error returned.
* @throws SmackException.NotLoggedInException if the XMPP connection is not authenticated.
* @throws PubSubException.NotALeafNodeException if a PubSub leaf node operation was attempted on a non-leaf node.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public synchronized void initialize()
throws SmackException.NotLoggedInException, CorruptedOmemoKeyException, InterruptedException,
@@ -279,7 +279,7 @@ public final class OmemoManager extends Manager {
* @see #requestDeviceListUpdateFor(BareJid)
* @param contact contact we want to get a set of device of.
* @return set of known devices of that contact.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public Set<OmemoDevice> getDevicesOf(BareJid contact) throws IOException {
OmemoCachedDeviceList list = getOmemoService().getOmemoStoreBackend().loadCachedDeviceList(getOwnDevice(), contact);
@@ -305,7 +305,7 @@ public final class OmemoManager extends Manager {
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws SmackException.NotLoggedInException if the XMPP connection is not authenticated.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public OmemoMessage.Sent encrypt(BareJid recipient, String message)
throws CryptoFailedException, UndecidedOmemoIdentityException,
@@ -328,7 +328,7 @@ public final class OmemoManager extends Manager {
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws SmackException.NotLoggedInException if the XMPP connection is not authenticated.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public synchronized OmemoMessage.Sent encrypt(Set<BareJid> recipients, String message)
throws CryptoFailedException, UndecidedOmemoIdentityException,
@@ -356,7 +356,7 @@ public final class OmemoManager extends Manager {
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws NoOmemoSupportException When the muc doesn't support OMEMO.
* @throws SmackException.NotLoggedInException if the XMPP connection is not authenticated.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public synchronized OmemoMessage.Sent encrypt(MultiUserChat muc, String message)
throws UndecidedOmemoIdentityException, CryptoFailedException,
@@ -388,7 +388,7 @@ public final class OmemoManager extends Manager {
* @throws CorruptedOmemoKeyException if our or their key is corrupted
* @throws NoRawSessionException if the message was not a preKeyMessage, but we had no session with the contact
* @throws CryptoFailedException if decryption fails
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public OmemoMessage.Received decrypt(BareJid sender, OmemoElement omemoElement)
throws SmackException.NotLoggedInException, CorruptedOmemoKeyException, NoRawSessionException,
@@ -403,7 +403,7 @@ public final class OmemoManager extends Manager {
* @param mamQuery The MAM query
* @return list of decrypted OmemoMessages
* @throws SmackException.NotLoggedInException if the Manager is not authenticated.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public List<MessageOrOmemoMessage> decryptMamQueryResult(MamManager.MamQuery mamQuery)
throws SmackException.NotLoggedInException, IOException {
@@ -486,7 +486,7 @@ public final class OmemoManager extends Manager {
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws NoSuchAlgorithmException if no such algorithm is available.
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public synchronized void sendRatchetUpdateMessage(OmemoDevice recipient)
throws SmackException.NotLoggedInException, CorruptedOmemoKeyException, InterruptedException,
@@ -515,7 +515,7 @@ public final class OmemoManager extends Manager {
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws PubSubException.NotALeafNodeException if a PubSub leaf node operation was attempted on a non-leaf node.
* @throws XMPPException.XMPPErrorException if there was an XMPP error returned.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public synchronized boolean contactSupportsOmemo(BareJid contact)
throws InterruptedException, PubSubException.NotALeafNodeException, XMPPException.XMPPErrorException,
@@ -567,7 +567,7 @@ public final class OmemoManager extends Manager {
* @return fingerprint TODO javadoc me please
* @throws SmackException.NotLoggedInException if we don't know our bareJid yet.
* @throws CorruptedOmemoKeyException if our identityKey is corrupted.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public synchronized OmemoFingerprint getOwnFingerprint()
throws SmackException.NotLoggedInException, CorruptedOmemoKeyException, IOException {
@@ -588,7 +588,7 @@ public final class OmemoManager extends Manager {
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public synchronized OmemoFingerprint getFingerprint(OmemoDevice device)
throws CannotEstablishOmemoSessionException, SmackException.NotLoggedInException,
@@ -618,7 +618,7 @@ public final class OmemoManager extends Manager {
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public synchronized HashMap<OmemoDevice, OmemoFingerprint> getActiveFingerprints(BareJid contact)
throws SmackException.NotLoggedInException, CorruptedOmemoKeyException,
@@ -688,7 +688,7 @@ public final class OmemoManager extends Manager {
* @throws XMPPException.XMPPErrorException if there was an XMPP error returned.
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public synchronized void requestDeviceListUpdateFor(BareJid contact)
throws InterruptedException, PubSubException.NotALeafNodeException, XMPPException.XMPPErrorException,
@@ -704,7 +704,7 @@ public final class OmemoManager extends Manager {
* @throws XMPPException.XMPPErrorException if there was an XMPP error returned.
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws PubSubException.NotALeafNodeException if a PubSub leaf node operation was attempted on a non-leaf node.
*/
public void purgeDeviceList()
@@ -724,7 +724,7 @@ public final class OmemoManager extends Manager {
* @throws SmackException.NotConnectedException XMPP error
* @throws SmackException.NoResponseException XMPP error
* @throws SmackException.NotLoggedInException if the XMPP connection is not authenticated.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws PubSubException.NotALeafNodeException if a PubSub leaf node operation was attempted on a non-leaf node.
*/
public synchronized void rotateSignedPreKey()


+ 2
- 2
smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoRatchet.java View File

@@ -66,7 +66,7 @@ public abstract class OmemoRatchet<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws NoRawSessionException when no double ratchet session was found.
* @throws CryptoFailedException if the OMEMO cryptography failed.
* @throws UntrustedOmemoIdentityException if the OMEMO identity is not trusted.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract byte[] doubleRatchetDecrypt(OmemoDevice sender, byte[] encryptedKey)
throws CorruptedOmemoKeyException, NoRawSessionException, CryptoFailedException,
@@ -88,7 +88,7 @@ public abstract class OmemoRatchet<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @return tuple of cipher generated from the unpacked message key and the auth-tag
* @throws CryptoFailedException if decryption using the double ratchet fails
* @throws NoRawSessionException if we have no session, but the element was NOT a PreKeyMessage
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
CipherAndAuthTag retrieveMessageKeyAndAuthTag(OmemoDevice sender, OmemoElement element) throws CryptoFailedException,
NoRawSessionException, IOException {


+ 20
- 20
smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java View File

@@ -238,7 +238,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws PubSubException.NotALeafNodeException if a PubSub leaf node operation was attempted on a non-leaf node.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
void init(OmemoManager.LoggedInOmemoManager managerGuard)
throws InterruptedException, CorruptedOmemoKeyException, XMPPException.XMPPErrorException,
@@ -278,7 +278,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws CorruptedOmemoKeyException if our IdentityKeyPair is corrupted.
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws CannotEstablishOmemoSessionException if session negotiation fails.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
OmemoElement createRatchetUpdateElement(OmemoManager.LoggedInOmemoManager managerGuard,
OmemoDevice contactsDevice)
@@ -340,7 +340,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws UndecidedOmemoIdentityException if the list of recipient devices contains undecided devices
* @throws CryptoFailedException if we are lacking some crypto primitives
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private OmemoMessage.Sent encrypt(OmemoManager.LoggedInOmemoManager managerGuard,
Set<OmemoDevice> contactsDevices,
@@ -442,7 +442,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws CorruptedOmemoKeyException if the identityKey of the sender is damaged.
* @throws CryptoFailedException if decryption fails.
* @throws NoRawSessionException if we have no session with the device and it sent a normal (non-preKey) message.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
OmemoMessage.Received decryptMessage(OmemoManager.LoggedInOmemoManager managerGuard,
BareJid senderJid,
@@ -496,7 +496,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws CryptoFailedException if we are lacking some cryptographic algorithms
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
OmemoMessage.Sent createKeyTransportElement(OmemoManager.LoggedInOmemoManager managerGuard,
Set<OmemoDevice> contactsDevices,
@@ -520,7 +520,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws CryptoFailedException if we are lacking some cryptographic algorithms
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
OmemoMessage.Sent createOmemoMessage(OmemoManager.LoggedInOmemoManager managerGuard,
Set<OmemoDevice> contactsDevices,
@@ -653,7 +653,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws XMPPException.XMPPErrorException if there was an XMPP error returned.
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private void refreshAndRepublishDeviceList(XMPPConnection connection, OmemoDevice userDevice)
throws InterruptedException, PubSubException.NotALeafNodeException, XMPPException.XMPPErrorException,
@@ -696,7 +696,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
*
* @param userDevice TODO javadoc me please
* @return
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
OmemoCachedDeviceList cleanUpDeviceList(OmemoDevice userDevice) throws IOException {
OmemoCachedDeviceList cachedDeviceList;
@@ -731,7 +731,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws XMPPException.XMPPErrorException if there was an XMPP error returned.
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
OmemoCachedDeviceList refreshDeviceList(XMPPConnection connection, OmemoDevice userDevice, BareJid contact)
throws InterruptedException, PubSubException.NotALeafNodeException, XMPPException.XMPPErrorException,
@@ -803,7 +803,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private Set<OmemoDevice> buildMissingSessionsWithDevices(XMPPConnection connection,
OmemoDevice userDevice,
@@ -842,7 +842,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @param callback OmemoTrustCallback to query the trust decisions from
* @param devices set of OmemoDevices
* @return set of OmemoDevices which contains all devices from the set devices, which are undecided
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private Set<OmemoDevice> getUndecidedDevices(OmemoDevice userDevice, OmemoTrustCallback callback, Set<OmemoDevice> devices) throws IOException {
Set<OmemoDevice> undecidedDevices = new HashSet<>();
@@ -873,7 +873,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @param userDevice our OmemoDevice.
* @param contactsDevice OmemoDevice of the contact.
* @return true if userDevice has session with contactsDevice.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private boolean hasSession(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException {
return getOmemoStoreBackend().loadRawSession(userDevice, contactsDevice) != null;
@@ -897,7 +897,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
*
* @param userDevice our OmemoDevice
* @return true if rotation is necessary
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private boolean shouldRotateSignedPreKey(OmemoDevice userDevice) throws IOException {
if (!OmemoConfiguration.getRenewOldSignedPreKeys()) {
@@ -926,7 +926,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
*
* @param userDevice our OmemoDevice
* @return our altered deviceList with stale devices marked as inactive.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private OmemoCachedDeviceList deleteStaleDevices(OmemoDevice userDevice) throws IOException {
OmemoCachedDeviceList deviceList = getOmemoStoreBackend().loadCachedDeviceList(userDevice);
@@ -946,7 +946,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @param contact subjects BareJid.
* @param contactsDeviceList subjects deviceList.
* @return copy of subjects deviceList with stale devices marked as inactive.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private OmemoCachedDeviceList removeStaleDevicesFromDeviceList(OmemoDevice userDevice,
BareJid contact,
@@ -1043,7 +1043,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @param managerGuard authenticated OmemoManager.
* @param mamQuery Mam archive query
* @return list of {@link MessageOrOmemoMessage}s.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
List<MessageOrOmemoMessage> decryptMamQueryResult(OmemoManager.LoggedInOmemoManager managerGuard,
MamManager.MamQuery mamQuery) throws IOException {
@@ -1221,7 +1221,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @param stanza stanza
* @param managerGuard authenticated OmemoManager
* @return decrypted OmemoMessage or null
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
OmemoMessage.Received decryptStanza(Stanza stanza, OmemoManager.LoggedInOmemoManager managerGuard) throws IOException {
OmemoManager manager = managerGuard.get();
@@ -1302,7 +1302,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
*
* @param managerGuard authenticated OmemoManager.
* @param brokenDevice device which session broke.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private void repairBrokenSessionWithPreKeyMessage(OmemoManager.LoggedInOmemoManager managerGuard,
OmemoDevice brokenDevice) throws IOException {
@@ -1335,7 +1335,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws CryptoFailedException if encryption fails (should not happen though, but who knows...)
* @throws CannotEstablishOmemoSessionException if we cannot establish a session with contactsDevice.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private void sendRatchetUpdate(OmemoManager.LoggedInOmemoManager managerGuard, OmemoDevice contactsDevice)
throws CorruptedOmemoKeyException, InterruptedException, SmackException.NoResponseException,
@@ -1382,7 +1382,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
* @throws XMPPException.XMPPErrorException if there was an XMPP error returned.
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws NotALeafNodeException if a PubSub leaf node operation was attempted on a non-leaf node.
*/
public void purgeDeviceList(OmemoManager.LoggedInOmemoManager managerGuard)


+ 34
- 34
smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java View File

@@ -79,7 +79,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our current device.
* @param id deviceId to check for.
* @return true if list did not contain our id, else false
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
boolean isAvailableDeviceId(OmemoDevice userDevice, int id) throws IOException {
LOGGER.log(Level.INFO, "Check if id " + id + " is available...");
@@ -103,7 +103,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param contact Contact we received the list from.
* @param list List we received.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
OmemoCachedDeviceList mergeCachedDeviceList(OmemoDevice userDevice, BareJid contact, OmemoDeviceListElement list) throws IOException {
OmemoCachedDeviceList cached = loadCachedDeviceList(userDevice, contact);
@@ -134,7 +134,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
*
* @param userDevice our OmemoDevice.
* @throws CorruptedOmemoKeyException when our identityKey is invalid.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws IllegalStateException when our IdentityKeyPair is null.
*/
void changeSignedPreKey(OmemoDevice userDevice)
@@ -163,7 +163,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* Remove the oldest signedPreKey until there are only MAX_NUMBER_OF_STORED_SIGNED_PREKEYS left.
*
* @param userDevice our OmemoDevice.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
private void removeOldSignedPreKeys(OmemoDevice userDevice) throws IOException {
if (OmemoConfiguration.getMaxNumberOfStoredSignedPreKeys() <= 0) {
@@ -186,7 +186,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @return OmemoBundleElement TODO javadoc me please
* @throws CorruptedOmemoKeyException when a key could not be loaded
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
OmemoBundleElement_VAxolotl packOmemoBundle(OmemoDevice userDevice)
throws CorruptedOmemoKeyException, IOException {
@@ -207,7 +207,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* Replenish our supply of keys. If we are missing any type of keys, generate them fresh.
* @param userDevice TODO javadoc me please
* @throws CorruptedOmemoKeyException if the OMEMO key is corrupted.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public void replenishKeys(OmemoDevice userDevice)
throws CorruptedOmemoKeyException, IOException {
@@ -251,7 +251,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @return identityKeyPair TODO javadoc me please
* @throws CorruptedOmemoKeyException Thrown, if the stored key is damaged (*hands up* not my fault!)
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract T_IdKeyPair loadOmemoIdentityKeyPair(OmemoDevice userDevice)
throws CorruptedOmemoKeyException, IOException;
@@ -262,7 +262,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
*
* @param userDevice our OmemoDevice.
* @param identityKeyPair identityKeyPair
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void storeOmemoIdentityKeyPair(OmemoDevice userDevice, T_IdKeyPair identityKeyPair) throws IOException;

@@ -279,7 +279,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param contactsDevice the device of which we want to load the identityKey.
* @return identityKey TODO javadoc me please
* @throws CorruptedOmemoKeyException when the key in question is corrupted and cant be deserialized.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract T_IdKey loadOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice contactsDevice)
throws CorruptedOmemoKeyException, IOException;
@@ -290,7 +290,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param contactsDevice device.
* @param contactsKey identityKey belonging to the contactsDevice.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void storeOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice contactsDevice, T_IdKey contactsKey) throws IOException;

@@ -309,7 +309,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our omemoDevice.
* @param contactsDevice device of which we want to set the message counter.
* @param counter counter value.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void storeOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice, int counter) throws IOException;

@@ -321,7 +321,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our omemoDevice
* @param contactsDevice device of which we want to get the message counter.
* @return counter value.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract int loadOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException;

@@ -331,7 +331,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice omemoManager of our device.
* @param contactsDevice device in question
* @param date date of the last received message
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void setDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) throws IOException;

@@ -341,7 +341,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param contactsDevice device in question
* @return date if existent, null
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract Date getDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException;

@@ -352,7 +352,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice
* @param contactsDevice OmemoDevice in question
* @param date date of the last publication after not being published
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void setDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) throws IOException;

@@ -363,7 +363,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice
* @param contactsDevice OmemoDevice in question
* @return date of the last publication after not being published
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract Date getDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException;

@@ -372,7 +372,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
*
* @param userDevice our OmemoDevice.
* @param date date
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void setDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice, Date date) throws IOException;

@@ -381,7 +381,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
*
* @param userDevice our OmemoDevice.
* @return date if existent, otherwise null
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract Date getDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice) throws IOException;

@@ -403,7 +403,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param preKeyId id of the key to be loaded
* @return loaded preKey
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract T_PreKey loadOmemoPreKey(OmemoDevice userDevice, int preKeyId) throws IOException;

@@ -413,7 +413,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param preKeyId id of the key
* @param preKey key
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void storeOmemoPreKey(OmemoDevice userDevice, int preKeyId, T_PreKey preKey) throws IOException;

@@ -422,7 +422,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
*
* @param userDevice our OmemoDevice.
* @param preKeyHashMap HashMap of preKeys
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public void storeOmemoPreKeys(OmemoDevice userDevice, TreeMap<Integer, T_PreKey> preKeyHashMap) throws IOException {
for (Map.Entry<Integer, T_PreKey> entry : preKeyHashMap.entrySet()) {
@@ -444,7 +444,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
*
* @param userDevice our OmemoDevice.
* @return Map containing our preKeys
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract TreeMap<Integer, T_PreKey> loadOmemoPreKeys(OmemoDevice userDevice) throws IOException;

@@ -454,7 +454,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param signedPreKeyId id of the key
* @return key TODO javadoc me please
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract T_SigPreKey loadOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId) throws IOException;

@@ -467,7 +467,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
*
* @param userDevice our OmemoDevice.
* @return HashMap of our singedPreKeys
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract TreeMap<Integer, T_SigPreKey> loadOmemoSignedPreKeys(OmemoDevice userDevice) throws IOException;

@@ -490,7 +490,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param signedPreKeyId id of the signedPreKey
* @param signedPreKey the key itself
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void storeOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId, T_SigPreKey signedPreKey) throws IOException;

@@ -508,7 +508,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param contactsDevice device whose session we want to load
* @return crypto related session
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract T_Sess loadRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException;

@@ -518,7 +518,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param contact BareJid of the contact we want to get all sessions from
* @return TreeMap of deviceId and sessions of the contact
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract HashMap<Integer, T_Sess> loadAllRawSessionsOf(OmemoDevice userDevice, BareJid contact) throws IOException;

@@ -528,7 +528,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param contactsDevice OmemoDevice whose session we want to store
* @param session session
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void storeRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice, T_Sess session) throws IOException;

@@ -564,7 +564,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param contact contact we want to get the deviceList of
* @return CachedDeviceList of the contact
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice, BareJid contact) throws IOException;

@@ -573,7 +573,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
*
* @param userDevice TODO javadoc me please
* @return the cached OMEMO device list.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice) throws IOException {
return loadCachedDeviceList(userDevice, userDevice.getJid());
@@ -586,7 +586,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @param userDevice our OmemoDevice.
* @param contact Contact
* @param contactsDeviceList list of the contacts devices' ids.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public abstract void storeCachedDeviceList(OmemoDevice userDevice,
BareJid contact,
@@ -613,7 +613,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @return fingerprint of our identityKeyPair
*
* @throws CorruptedOmemoKeyException if the identityKey of userDevice is corrupted.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public OmemoFingerprint getFingerprint(OmemoDevice userDevice)
throws CorruptedOmemoKeyException, IOException {
@@ -634,7 +634,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @return fingerprint of the userDevices IdentityKey.
* @throws CorruptedOmemoKeyException if the IdentityKey is corrupted.
* @throws NoIdentityKeyException if no IdentityKey for contactsDevice has been found locally.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public OmemoFingerprint getFingerprint(OmemoDevice userDevice, OmemoDevice contactsDevice)
throws CorruptedOmemoKeyException, NoIdentityKeyException, IOException {
@@ -660,7 +660,7 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @throws SmackException.NotConnectedException if the XMPP connection is not connected.
* @throws InterruptedException if the calling thread was interrupted.
* @throws SmackException.NoResponseException if there was no response from the remote entity.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public OmemoFingerprint getFingerprintAndMaybeBuildSession(OmemoManager.LoggedInOmemoManager managerGuard, OmemoDevice contactsDevice)
throws CannotEstablishOmemoSessionException, CorruptedOmemoKeyException,


+ 1
- 1
smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java View File

@@ -220,7 +220,7 @@ public class OmemoMessageBuilder<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
* @throws CorruptedOmemoKeyException if the identityKey of that device is corrupted.
* @throws UndecidedOmemoIdentityException if the user hasn't yet decided whether to trust that device or not.
* @throws UntrustedOmemoIdentityException if the user has decided not to trust that device.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
*/
public void addRecipient(OmemoDevice contactsDevice)
throws NoIdentityKeyException, CorruptedOmemoKeyException, UndecidedOmemoIdentityException,


+ 3
- 3
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java View File

@@ -629,7 +629,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
*
* @throws XMPPException if establishing a connection to the server fails.
* @throws SmackException if the server fails to respond back or if there is anther error.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws InterruptedException if the calling thread was interrupted.
*/
private void initConnection() throws IOException, InterruptedException {
@@ -673,7 +673,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
* The server has indicated that TLS negotiation can start. We now need to secure the
* existing plain connection and perform a handshake. This method won't return until the
* connection has finished the handshake or an error occurred while securing the connection.
* @throws IOException if an I/O error occured.
* @throws IOException if an I/O error occurred.
* @throws CertificateException
* @throws NoSuchAlgorithmException if no such algorithm is available.
* @throws NoSuchProviderException
@@ -809,7 +809,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {