Improve PepManager.publish()

by using PubSubManager.tryToPublishAndPossibleAutoCreate().

This also swaps the parameters of the method.

Thanks to Guus der Kinderen for suggesting this.

build.gradle

@@ -99,6 +99,7 @@ allprojects {
 		gplLicensedProjects = [
 			':smack-omemo-signal',
 			':smack-omemo-signal-integration-test',
+			':smack-repl'
 		].collect{ project(it) }
 		// When this list is empty, then move the according javadoc
 		// tool Werror option into the global configure section.

config/checkstyle/smack-repl-gplv3-license-header.txt

@@ -0,0 +1,20 @@
+/**
+ *
+ * Copyright 20XX John Doe
+ *
+ * This file is part of smack-repl.
+ *
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ */

documentation/extensions/muc.md

@@ -81,7 +81,7 @@ completed with default values:
 MultiUserChatManager manager = MultiUserChatManager.getInstanceFor(connection);
 
 // Create a MultiUserChat using an XMPPConnection for a room
-MultiUserChat muc = = manager.getMultiUserChat(mucJid);
+MultiUserChat muc = manager.getMultiUserChat(mucJid);
 
 // Prepare a list of owners of the new room
 Set<Jid> owners = JidUtil.jidSetFrom(new String[] { "me@example.org", "juliet@example.org" });

documentation/gettingstarted.md

@@ -62,7 +62,7 @@ XMPPTCPConnectionConfiguration config = XMPPTCPConnectionConfiguration.builder()
   .setPort(8222)
   .build();
 
-AbstractXMPPConnection conn2 = **new** XMPPTCPConnection(config);
+AbstractXMPPConnection conn2 = new XMPPTCPConnection(config);
 conn2.connect().login();
 ```
 

documentation/processing.md

@@ -20,7 +20,8 @@ and a stanza listener:
 ```
 // Create a stanza filter to listen for new messages from a particular
 // user. We use an AndFilter to combine two other filters._
-StanzaFilter filter = new AndFilter(StanzaTypeFilter.MESSAGE, FromMatchesFilter.create("mary@jivesoftware.com"));
+StanzaFilter filter = new AndFilter(StanzaTypeFilter.MESSAGE, 
+	FromMatchesFilter.create(JidCreate.entityBareFrom("mary@jivesoftware.com")));
 // Assume we've created an XMPPConnection named "connection".
 
 // First, register a stanza collector using the filter we created.
@@ -29,7 +30,7 @@ StanzaCollector myCollector = connection.createStanzaCollector(filter);
 
 // Next, create a stanza listener. We use an anonymous inner class for brevity.
 StanzaListener myListener = new StanzaListener() {
-		**public** **void** processStanza(Stanza stanza) {
+		public void processStanza(Stanza stanza) {
 			// Do something with the incoming stanza here._
 		}
 	};

documentation/providers.md

@@ -46,9 +46,9 @@ ProviderManager.addExtensionProvider("element", "namespace", new MyExtProvider()
 
   * Add a loader - You can add a ProviderLoader which will inject a means of loading multiple providers (both types) into the manager. This is the mechanism used by Smack to load from the Smack specific file format (via ProviderFileLoader). Implementers can provide the means to load providers from any source they wish, or simply reuse the ProviderFileLoader to load from their own provider files.
 
-
+```
 	ProviderManager.addLoader(new ProviderFileLoader(FileUtils.getStreamForUrl("classpath:com/myco/provider/myco_custom.providers", null)));
-
+```
 
   * VM Argument - You can add a provider file via the VM argument _smack.provider.file_. This will load the file at the specified URL during startup when Smack initializes. This also assumes the default configuration, since it requires that the **VmArgInitializer** was part of the startup configuration.
 

resources/releasedocs/changelog.html

@@ -141,6 +141,32 @@ hr {
 
 	<div id="pageBody">
 
+<h2>4.3.4 -- <span style="font-weight: normal;">2019-05-27</span></h2>
+
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-861'>SMACK-861</a>] -         Potential NPE in Roster.getPresencesInternal(BareJid)
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-863'>SMACK-863</a>] -         ServiceDiscoveryManger does not use the main identity, causing setIdentity() to have no effect
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-864'>SMACK-864</a>] -         Potential Denial of Service (DOS) by remote entities caused by unlimited threads for asynchronous operations
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-865'>SMACK-865</a>] -         Some Manager.getInsanceFor() methods are missing the &#39;synchronized&#39; keyword
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-868'>SMACK-868</a>] -         XHTMLText.appendOpenBodyTag() produces invalid XML
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-870'>SMACK-870</a>] -         TLS X.509 certificate verification should be performed with the ACE representation of the XMPP service domain when possible
+</li>
+</ul>
+
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-869'>SMACK-869</a>] -         Exceptions in async tasks should not go uncaught to the call stack to avoid program termination
+</li>
+</ul>
+
 <h2>4.3.3 -- <span style="font-weight: normal;">2019-03-14</span></h2>
 
 <h2>        Bug

smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java

@@ -1192,8 +1192,13 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
 
     @Override
     public void setReplyTimeout(long timeout) {
+        if (Long.MAX_VALUE - System.currentTimeMillis() < timeout) {
+            throw new IllegalArgumentException("Extremely long reply timeout");
+        }
+        else {
             replyTimeout = timeout;
         }
+    }
 
     private SmackConfiguration.UnknownIqRequestReplyMode unknownIqRequestReplyMode = SmackConfiguration.getUnknownIqRequestReplyMode();
 
@@ -1251,7 +1256,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
         try {
             stanza = PacketParserUtils.parseStanza(parser, incomingStreamXmlEnvironment);
         }
-        catch (XmlPullParserException | SmackParsingException | IOException e) {
+        catch (XmlPullParserException | SmackParsingException | IOException | IllegalArgumentException e) {
             CharSequence content = PacketParserUtils.parseContentDepth(parser,
                             parserDepth);
             UnparseableStanza message = new UnparseableStanza(content, e);

smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java

@@ -750,7 +750,7 @@ public abstract class ConnectionConfiguration {
 
         /**
          * Set the Internet address of the host providing the XMPP service. If set, then this will overwrite anything
-         * set via {@link #setHost(String)}.
+         * set via {@link #setHost(CharSequence)}.
          *
          * @param address the Internet address of the host providing the XMPP service.
          * @return a reference to this builder.
@@ -762,16 +762,29 @@ public abstract class ConnectionConfiguration {
         }
 
         /**
-         * Set the name of the host providing the XMPP service. Note that this method does only allow DNS names and not
+         * Set the name of the host providing the XMPP service. This method takes DNS names and
-         * IP addresses. Use {@link #setHostAddress(InetAddress)} if you want to explicitly set the Internet address of
+         * IP addresses.
-         * the host providing the XMPP service.
          *
          * @param host the DNS name of the host providing the XMPP service.
          * @return a reference to this builder.
          */
-        public B setHost(String host) {
+        public B setHost(CharSequence host) {
-            DnsName hostDnsName = DnsName.from(host);
+            String fqdnOrIpString = host.toString();
-            return setHost(hostDnsName);
+            if (InetAddressUtil.isIpAddress(fqdnOrIpString)) {
+                InetAddress hostInetAddress;
+                try {
+                    hostInetAddress = InetAddress.getByName(fqdnOrIpString);
+                }
+                catch (UnknownHostException e) {
+                    // Should never happen.
+                    throw new AssertionError(e);
+                }
+                setHostAddress(hostInetAddress);
+            } else {
+                DnsName dnsName = DnsName.from(fqdnOrIpString);
+                setHost(dnsName);
+            }
+            return getThis();
         }
 
         /**
@@ -795,23 +808,12 @@ public abstract class ConnectionConfiguration {
          * @see #setHost(DnsName)
          * @see #setHostAddress(InetAddress)
          * @since 4.3.2
+         * @deprecated use {@link #setHost(CharSequence)} instead.
          */
+        @Deprecated
+        // TODO: Remove in Smack 4.5.
         public B setHostAddressByNameOrIp(CharSequence fqdnOrIp) {
-            String fqdnOrIpString = fqdnOrIp.toString();
+            return setHost(fqdnOrIp);
-            if (InetAddressUtil.isIpAddress(fqdnOrIp)) {
-                InetAddress hostInetAddress;
-                try {
-                    hostInetAddress = InetAddress.getByName(fqdnOrIpString);
-                }
-                catch (UnknownHostException e) {
-                    // Should never happen.
-                    throw new AssertionError(e);
-                }
-                setHostAddress(hostInetAddress);
-            } else {
-                setHost(fqdnOrIpString);
-            }
-            return getThis();
         }
 
         public B setPort(int port) {

smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java

@@ -257,9 +257,8 @@ public abstract class SASLMechanism implements Comparable<SASLMechanism> {
 
     @Override
     public final int compareTo(SASLMechanism other) {
-        // Switch to Integer.compare(int, int) once Smack is on Android 19 or higher.
         Integer ourPriority = getPriority();
-        return ourPriority.compareTo(other.getPriority());
+        return Integer.compare(ourPriority, other.getPriority());
     }
 
     /**

smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java

@@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Random;
+import java.util.regex.Pattern;
 
 /**
  * A collection of utility methods for String objects.
@@ -541,4 +542,16 @@ public class StringUtils {
         }
         return cs.toString();
     }
+
+    /**
+     * Defined by XML 1.0 § 2.3 as:
+     *  S      ::=      (#x20 | #x9 | #xD | #xA)+
+     *
+     * @see <a href="https://www.w3.org/TR/xml/#sec-white-space">XML 1.0 § 2.3</a>
+     */
+    private static final Pattern XML_WHITESPACE = Pattern.compile("[\t\n\r ]");
+
+    public static String deleteXmlWhitespace(String string) {
+        return XML_WHITESPACE.matcher(string).replaceAll("");
+    }
 }

smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base64.java

@@ -19,6 +19,7 @@ package org.jivesoftware.smack.util.stringencoder;
 import java.nio.charset.StandardCharsets;
 
 import org.jivesoftware.smack.util.Objects;
+import org.jivesoftware.smack.util.StringUtils;
 
 public class Base64 {
 
@@ -57,6 +58,9 @@ public class Base64 {
     // TODO: We really should not mask the IllegalArgumentException. But some unit test depend on this behavior, like
     // ibb.packet.DataPacketExtension.shouldReturnNullIfDataIsInvalid().
     public static final byte[] decode(String string) {
+        // xs:base64Binary may include XML whitespace which we need to delete before feeding the string into the Base64
+        // decoder. See also XML Schema Part 2: Datatypes Second Edition § 3.2.16.
+        string = StringUtils.deleteXmlWhitespace(string);
         try {
             return base64encoder.decode(string);
         } catch (IllegalArgumentException e) {

smack-core/src/test/java/org/jivesoftware/smack/ConnectionConfigurationTest.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2018 Florian Schmaus.
+ * Copyright 2018-2019 Florian Schmaus.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ public class ConnectionConfigurationTest {
         DummyConnectionConfiguration.Builder builder = newUnitTestBuilder();
 
         final String ip = "192.168.0.1";
-        builder.setHostAddressByNameOrIp(ip);
+        builder.setHost(ip);
 
         DummyConnectionConfiguration connectionConfiguration = builder.build();
         assertEquals('/' + ip, connectionConfiguration.getHostAddress().toString());
@@ -39,7 +39,7 @@ public class ConnectionConfigurationTest {
         DummyConnectionConfiguration.Builder builder = newUnitTestBuilder();
 
         final String fqdn = "foo.example.org";
-        builder.setHostAddressByNameOrIp(fqdn);
+        builder.setHost(fqdn);
 
         DummyConnectionConfiguration connectionConfiguration = builder.build();
         assertEquals(fqdn, connectionConfiguration.getHost().toString());

smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java

@@ -109,4 +109,16 @@ public class StringUtilsTest  {
         String result = StringUtils.randomString(0);
         assertEquals("", result);
     }
+
+    @Test
+    public void testeDeleteXmlWhitespace() {
+        String noWhitespace = StringUtils.deleteXmlWhitespace(" foo\nbar ");
+        assertEquals("foobar", noWhitespace);
+
+        noWhitespace = StringUtils.deleteXmlWhitespace(" \tbaz\rbarz\t ");
+        assertEquals("bazbarz", noWhitespace);
+
+        noWhitespace = StringUtils.deleteXmlWhitespace("SNAFU");
+        assertEquals("SNAFU", noWhitespace);
+    }
 }

smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java

@@ -387,11 +387,6 @@ public final class HttpFileUploadManager extends Manager {
 
     private void uploadFile(final File file, final Slot slot, UploadProgressListener listener) throws IOException {
         final long fileSize = file.length();
-        // TODO Remove once Smack's minimum Android API level is 19 or higher. See also comment below.
-        if (fileSize >= Integer.MAX_VALUE) {
-            throw new IllegalArgumentException("File size " + fileSize + " must be less than " + Integer.MAX_VALUE);
-        }
-        final int fileSizeInt = (int) fileSize;
 
         // Construct the FileInputStream first to make sure we can actually read the file.
         final FileInputStream fis = new FileInputStream(file);
@@ -403,8 +398,7 @@ public final class HttpFileUploadManager extends Manager {
         urlConnection.setRequestMethod("PUT");
         urlConnection.setUseCaches(false);
         urlConnection.setDoOutput(true);
-        // TODO Change to using fileSize once Smack's minimum Android API level is 19 or higher.
+        urlConnection.setFixedLengthStreamingMode(fileSize);
-        urlConnection.setFixedLengthStreamingMode(fileSizeInt);
         urlConnection.setRequestProperty("Content-Type", "application/octet-stream;");
         for (Entry<String, String> header : slot.getHeaders().entrySet()) {
             urlConnection.setRequestProperty(header.getKey(), header.getValue());

smack-extensions/src/main/java/org/jivesoftware/smackx/disco/DiscoInfoLookupShortcutMechanism.java

@@ -47,8 +47,7 @@ public abstract class DiscoInfoLookupShortcutMechanism implements Comparable<Dis
 
     @Override
     public final int compareTo(DiscoInfoLookupShortcutMechanism other) {
-        // Switch to Integer.compare(int, int) once Smack is on Android 19 or higher.
         Integer ourPriority = getPriority();
-        return ourPriority.compareTo(other.getPriority());
+        return Integer.compare(ourPriority, other.getPriority());
     }
 }

smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java

@@ -28,8 +28,7 @@ import org.jivesoftware.smackx.disco.packet.DiscoverItems;
 /**
  * The NodeInformationProvider is responsible for providing supported identities, features
  * and hosted items (i.e. DiscoverItems.Item) about a given node. This information will be
- * requested each time this XMPPP client receives a disco info or items requests on the
+ * requested each time this XMPP client receives a disco info or items requests on the
- * given node. each time this XMPPP client receives a disco info or items requests on the
  * given node.
  *
  * @author Gaston Dombiak

smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java

@@ -294,6 +294,9 @@ public final class MultiUserChatManager extends Manager {
      * Returns a Set of the rooms where the user has joined. The Iterator will contain Strings where each String
      * represents a room (e.g. room@muc.jabber.org).
      *
+     * Note: In order to get a list of bookmarked (but not necessarily joined) conferences, use
+     * {@link org.jivesoftware.smackx.bookmarks.BookmarkManager#getBookmarkedConferences()}.
+     *
      * @return a List of the rooms where the user has joined using a given connection.
      */
     public Set<EntityBareJid> getJoinedRooms() {

smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PepManager.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2007 Jive Software, 2015-2018 Florian Schmaus
+ * Copyright 2003-2007 Jive Software, 2015-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@ import org.jivesoftware.smackx.pubsub.EventElement;
 import org.jivesoftware.smackx.pubsub.Item;
 import org.jivesoftware.smackx.pubsub.LeafNode;
 import org.jivesoftware.smackx.pubsub.PubSubException.NotALeafNodeException;
-import org.jivesoftware.smackx.pubsub.PubSubException.NotAPubSubNodeException;
 import org.jivesoftware.smackx.pubsub.PubSubFeature;
 import org.jivesoftware.smackx.pubsub.PubSubManager;
 import org.jivesoftware.smackx.pubsub.filter.EventExtensionFilter;
@@ -151,19 +150,19 @@ public final class PepManager extends Manager {
     /**
      * Publish an event.
      *
+     * @param nodeId the ID of the node to publish on.
      * @param item the item to publish.
-     * @param node the node to publish on.
+     * @return the leaf node the item was published on.
      * @throws NotConnectedException
      * @throws InterruptedException
      * @throws XMPPErrorException
      * @throws NoResponseException
-     * @throws NotAPubSubNodeException
      * @throws NotALeafNodeException
      */
-    public void publish(Item item, String node) throws NotConnectedException, InterruptedException,
+    public LeafNode publish(String nodeId, Item item) throws NotConnectedException, InterruptedException,
-                    NoResponseException, XMPPErrorException, NotAPubSubNodeException, NotALeafNodeException {
+                    NoResponseException, XMPPErrorException, NotALeafNodeException {
-        LeafNode pubSubNode = pepPubSubManager.getLeafNode(node);
+        // PEP nodes are auto created if not existent. Hence Use PubSubManager.tryToPublishAndPossibleAutoCreate() here.
-        pubSubNode.publish(item);
+        return pepPubSubManager.tryToPublishAndPossibleAutoCreate(nodeId, item);
     }
 
     /**

smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java

@@ -186,6 +186,17 @@ public final class PubSubManager extends Manager {
         pubSubService = toAddress;
     }
 
+    private void checkIfXmppErrorBecauseOfNotLeafNode(String nodeId, XMPPErrorException xmppErrorException)
+                    throws XMPPErrorException, NotALeafNodeException {
+        Condition condition = xmppErrorException.getStanzaError().getCondition();
+        if (condition == Condition.feature_not_implemented) {
+            // XEP-0060 § 6.5.9.5: Item retrieval not supported, e.g. because node is a collection node
+            throw new PubSubException.NotALeafNodeException(nodeId, pubSubService);
+        }
+
+        throw xmppErrorException;
+    }
+
     /**
      * Creates an instant node, if supported.
      *
@@ -387,13 +398,7 @@ public final class PubSubManager extends Manager {
             // Try to ensure that this is not a collection node by asking for one item form the node.
             leafNode.getItems(1);
         } catch (XMPPErrorException e) {
-            Condition condition = e.getStanzaError().getCondition();
+            checkIfXmppErrorBecauseOfNotLeafNode(id, e);
-            if (condition == Condition.feature_not_implemented) {
-                // XEP-0060 § 6.5.9.5: Item retrieval not supported, e.g. because node is a collection node
-                throw new PubSubException.NotALeafNodeException(id, pubSubService);
-            }
-
-            throw e;
         }
 
         nodeMap.put(id, leafNode);
@@ -430,12 +435,19 @@ public final class PubSubManager extends Manager {
      * @throws XMPPErrorException
      * @throws NotConnectedException
      * @throws InterruptedException
+     * @throws NotALeafNodeException
      * @since 4.2.1
      */
     public <I extends Item> LeafNode tryToPublishAndPossibleAutoCreate(String id, I item)
-                    throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
+                    throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException,
+                    NotALeafNodeException {
         LeafNode leafNode = new LeafNode(this, id);
+
+        try {
             leafNode.publish(item);
+        } catch (XMPPErrorException e) {
+            checkIfXmppErrorBecauseOfNotLeafNode(id, e);
+        }
 
         // If LeafNode.publish() did not throw then we have successfully published an item and possible auto-created
         // (XEP-0163 § 3., XEP-0060 § 7.1.4) the node. So we can put the node into the nodeMap.

smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java

@@ -1680,7 +1680,7 @@ public final class Roster extends Manager {
         @Override
         public void onSuccess(IQ packet) {
             final XMPPConnection connection = connection();
-            LOGGER.log(Level.FINE, "RosterResultListener received {}", packet);
+            LOGGER.log(Level.FINE, "RosterResultListener received {0}", packet);
             Collection<Jid> addedEntries = new ArrayList<>();
             Collection<Jid> updatedEntries = new ArrayList<>();
             Collection<Jid> deletedEntries = new ArrayList<>();

smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractTwoUsersOmemoIntegrationTest.java

@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.omemo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
+import java.io.IOException;
 import java.util.logging.Level;
 
 import org.jivesoftware.smack.SmackException;
@@ -64,7 +65,7 @@ public abstract class AbstractTwoUsersOmemoIntegrationTest extends AbstractOmemo
     }
 
     @AfterClass
-    public void cleanUp() {
+    public void cleanUp() throws IOException {
         alice.stopStanzaAndPEPListeners();
         bob.stopStanzaAndPEPListeners();
         OmemoManagerSetupHelper.cleanUpPubSub(alice);

smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/MessageEncryptionIntegrationTest.java

@@ -55,6 +55,7 @@ public class MessageEncryptionIntegrationTest extends AbstractTwoUsersOmemoInteg
      * Bob still has B2
      * @throws Exception
      */
+    @SuppressWarnings("SynchronizeOnNonFinalField")
     @SmackIntegrationTest
     public void messageTest() throws Exception {
         OmemoBundleElement a1 = alice.getOmemoService().getOmemoStoreBackend().packOmemoBundle(alice.getOwnDevice());
@@ -74,7 +75,7 @@ public class MessageEncryptionIntegrationTest extends AbstractTwoUsersOmemoInteg
         OmemoBundleElement a1_ = alice.getOmemoService().getOmemoStoreBackend().packOmemoBundle(alice.getOwnDevice());
         OmemoBundleElement b2;
 
-        synchronized (bob.LOCK) { // Circumvent race condition where bundle gets replenished after getting stored in b2
+        synchronized (bob) { // Circumvent race condition where bundle gets replenished after getting stored in b2
             b2 = bob.getOmemoService().getOmemoStoreBackend().packOmemoBundle(bob.getOwnDevice());
         }
 

smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoMamDecryptionTest.java

@@ -18,6 +18,7 @@ package org.jivesoftware.smackx.omemo;
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.jivesoftware.smack.SmackException;
@@ -50,7 +51,7 @@ public class OmemoMamDecryptionTest extends AbstractTwoUsersOmemoIntegrationTest
     @SmackIntegrationTest
     public void mamDecryptionTest() throws XMPPException.XMPPErrorException, SmackException.NotLoggedInException,
             SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException,
-            CryptoFailedException, UndecidedOmemoIdentityException {
+            CryptoFailedException, UndecidedOmemoIdentityException, IOException {
         // Make sure, Bobs server stores messages in the archive
         MamManager bobsMamManager = MamManager.getInstanceFor(bob.getConnection());
         bobsMamManager.enableMamForAllMessages();

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

@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
 import java.util.HashMap;
 
 import org.jivesoftware.smack.SmackException;
@@ -46,7 +47,7 @@ public class OmemoManagerSetupHelper {
     public static void trustAllIdentities(OmemoManager alice, OmemoManager bob)
             throws InterruptedException, SmackException.NotConnectedException, SmackException.NotLoggedInException,
             SmackException.NoResponseException, CannotEstablishOmemoSessionException, CorruptedOmemoKeyException,
-            XMPPException.XMPPErrorException, PubSubException.NotALeafNodeException {
+            XMPPException.XMPPErrorException, PubSubException.NotALeafNodeException, IOException {
         Roster roster = Roster.getInstanceFor(alice.getConnection());
 
         if (alice.getOwnJid() != bob.getOwnJid() &&
@@ -66,7 +67,7 @@ public class OmemoManagerSetupHelper {
     public static void trustAllIdentitiesWithTests(OmemoManager alice, OmemoManager bob)
             throws InterruptedException, SmackException.NotConnectedException, SmackException.NotLoggedInException,
             SmackException.NoResponseException, CannotEstablishOmemoSessionException, CorruptedOmemoKeyException,
-            XMPPException.XMPPErrorException, PubSubException.NotALeafNodeException {
+            XMPPException.XMPPErrorException, PubSubException.NotALeafNodeException, IOException {
         alice.requestDeviceListUpdateFor(bob.getOwnJid());
         HashMap<OmemoDevice, OmemoFingerprint> fps1 = alice.getActiveFingerprints(bob.getOwnJid());
 
@@ -124,7 +125,7 @@ public class OmemoManagerSetupHelper {
         }
     }
 
-    public static void cleanUpPubSub(OmemoManager omemoManager) {
+    public static void cleanUpPubSub(OmemoManager omemoManager) throws IOException {
         PubSubManager pm = PubSubManager.getInstanceFor(omemoManager.getConnection(), omemoManager.getOwnJid());
         try {
             omemoManager.requestDeviceListUpdateFor(omemoManager.getOwnJid());

smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/ReadOnlyDeviceIntegrationTest.java

@@ -20,6 +20,8 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 
+import java.io.IOException;
+
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.omemo.exceptions.CryptoFailedException;
@@ -37,7 +39,9 @@ public class ReadOnlyDeviceIntegrationTest extends AbstractTwoUsersOmemoIntegrat
     }
 
     @SmackIntegrationTest
-    public void test() throws InterruptedException, SmackException.NoResponseException, SmackException.NotLoggedInException, SmackException.NotConnectedException, CryptoFailedException, UndecidedOmemoIdentityException {
+    public void test() throws InterruptedException, SmackException.NoResponseException,
+                    SmackException.NotLoggedInException, SmackException.NotConnectedException, CryptoFailedException,
+                    UndecidedOmemoIdentityException, IOException {
         boolean prevIgnoreReadOnlyConf = OmemoConfiguration.getIgnoreReadOnlyDevices();
         int prevMaxMessageCounter = OmemoConfiguration.getMaxReadOnlyMessageCount();
 

smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/SessionRenegotiationIntegrationTest.java

@@ -31,6 +31,7 @@ public class SessionRenegotiationIntegrationTest extends AbstractTwoUsersOmemoIn
         super(environment);
     }
 
+    @SuppressWarnings("SynchronizeOnNonFinalField")
     @SmackIntegrationTest
     public void sessionRenegotiationTest() throws Exception {
 
@@ -50,7 +51,7 @@ public class SessionRenegotiationIntegrationTest extends AbstractTwoUsersOmemoIn
         bob.removeOmemoMessageListener(listener1);
 
         // Remove the session on Bobs side.
-        synchronized (bob.LOCK) {
+        synchronized (bob) {
             bob.getOmemoService().getOmemoStoreBackend().removeRawSession(bob.getOwnDevice(), alice.getOwnDevice());
         }
 

smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoRatchet.java

@@ -20,6 +20,7 @@
  */
 package org.jivesoftware.smackx.omemo.signal;
 
+import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -73,7 +74,7 @@ public class SignalOmemoRatchet
     @Override
     public byte[] doubleRatchetDecrypt(OmemoDevice sender, byte[] encryptedKey)
             throws CorruptedOmemoKeyException, NoRawSessionException, CryptoFailedException,
-            UntrustedOmemoIdentityException {
+            UntrustedOmemoIdentityException, IOException {
 
         SessionCipher cipher = getCipher(sender);
         byte[] decryptedKey;

smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoStoreConnector.java

@@ -20,6 +20,7 @@
  */
 package org.jivesoftware.smackx.omemo.signal;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeMap;
@@ -79,7 +80,7 @@ public class SignalOmemoStoreConnector
     public IdentityKeyPair getIdentityKeyPair() {
         try {
             return omemoStore.loadOmemoIdentityKeyPair(getOurDevice());
-        } catch (CorruptedOmemoKeyException e) {
+        } catch (CorruptedOmemoKeyException | IOException e) {
             LOGGER.log(Level.SEVERE, "IdentityKeyPair seems to be invalid.", e);
             return null;
         }
@@ -103,7 +104,11 @@ public class SignalOmemoStoreConnector
             throw new AssertionError(e);
         }
 
+        try {
             omemoStore.storeOmemoIdentityKey(getOurDevice(), device, identityKey);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
         return true;
     }
 
@@ -118,7 +123,12 @@ public class SignalOmemoStoreConnector
 
     @Override
     public PreKeyRecord loadPreKey(int i) throws InvalidKeyIdException {
-        PreKeyRecord preKey = omemoStore.loadOmemoPreKey(getOurDevice(), i);
+        PreKeyRecord preKey;
+        try {
+            preKey = omemoStore.loadOmemoPreKey(getOurDevice(), i);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
 
         if (preKey == null) {
             throw new InvalidKeyIdException("No PreKey with Id " + i + " found.");
@@ -129,7 +139,11 @@ public class SignalOmemoStoreConnector
 
     @Override
     public void storePreKey(int i, PreKeyRecord preKeyRecord) {
+        try {
             omemoStore.storeOmemoPreKey(getOurDevice(), i, preKeyRecord);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     @Override
@@ -155,7 +169,12 @@ public class SignalOmemoStoreConnector
             throw new AssertionError(e);
         }
 
-        SessionRecord record = omemoStore.loadRawSession(getOurDevice(), device);
+        SessionRecord record;
+        try {
+            record = omemoStore.loadRawSession(getOurDevice(), device);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
 
         if (record != null) {
             return record;
@@ -173,7 +192,11 @@ public class SignalOmemoStoreConnector
             throw new AssertionError(e);
         }
 
+        try {
             return new ArrayList<>(omemoStore.loadAllRawSessionsOf(getOurDevice(), jid).keySet());
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     @Override
@@ -185,7 +208,11 @@ public class SignalOmemoStoreConnector
             throw new AssertionError(e);
         }
 
+        try {
             omemoStore.storeRawSession(getOurDevice(), device, sessionRecord);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     @Override
@@ -226,7 +253,12 @@ public class SignalOmemoStoreConnector
 
     @Override
     public SignedPreKeyRecord loadSignedPreKey(int i) throws InvalidKeyIdException {
-        SignedPreKeyRecord signedPreKeyRecord = omemoStore.loadOmemoSignedPreKey(getOurDevice(), i);
+        SignedPreKeyRecord signedPreKeyRecord;
+        try {
+            signedPreKeyRecord = omemoStore.loadOmemoSignedPreKey(getOurDevice(), i);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
         if (signedPreKeyRecord == null) {
             throw new InvalidKeyIdException("No signed preKey with id " + i + " found.");
         }
@@ -236,14 +268,22 @@ public class SignalOmemoStoreConnector
     @Override
     public List<SignedPreKeyRecord> loadSignedPreKeys() {
 
-        TreeMap<Integer, SignedPreKeyRecord> signedPreKeyRecordHashMap =
+        TreeMap<Integer, SignedPreKeyRecord> signedPreKeyRecordHashMap;
-                omemoStore.loadOmemoSignedPreKeys(getOurDevice());
+        try {
+            signedPreKeyRecordHashMap = omemoStore.loadOmemoSignedPreKeys(getOurDevice());
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
         return new ArrayList<>(signedPreKeyRecordHashMap.values());
     }
 
     @Override
     public void storeSignedPreKey(int i, SignedPreKeyRecord signedPreKeyRecord) {
+        try {
             omemoStore.storeOmemoSignedPreKey(getOurDevice(), i, signedPreKeyRecord);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     @Override

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java

@@ -16,6 +16,7 @@
  */
 package org.jivesoftware.smackx.omemo;
 
+import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.SortedSet;
@@ -80,7 +81,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
 
     @Override
     public T_IdKeyPair loadOmemoIdentityKeyPair(OmemoDevice userDevice)
-            throws CorruptedOmemoKeyException {
+            throws CorruptedOmemoKeyException, IOException {
         T_IdKeyPair pair = getCache(userDevice).identityKeyPair;
 
         if (pair == null && persistent != null) {
@@ -94,7 +95,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public void storeOmemoIdentityKeyPair(OmemoDevice userDevice, T_IdKeyPair identityKeyPair) {
+    public void storeOmemoIdentityKeyPair(OmemoDevice userDevice, T_IdKeyPair identityKeyPair) throws IOException {
         getCache(userDevice).identityKeyPair = identityKeyPair;
         if (persistent != null) {
             persistent.storeOmemoIdentityKeyPair(userDevice, identityKeyPair);
@@ -111,7 +112,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
 
     @Override
     public T_IdKey loadOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice contactsDevice)
-            throws CorruptedOmemoKeyException {
+            throws CorruptedOmemoKeyException, IOException {
         T_IdKey idKey = getCache(userDevice).identityKeys.get(contactsDevice);
 
         if (idKey == null && persistent != null) {
@@ -125,7 +126,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public void storeOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice device, T_IdKey t_idKey) {
+    public void storeOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice device, T_IdKey t_idKey) throws IOException {
         getCache(userDevice).identityKeys.put(device, t_idKey);
         if (persistent != null) {
             persistent.storeOmemoIdentityKey(userDevice, device, t_idKey);
@@ -141,7 +142,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public void storeOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice, int counter) {
+    public void storeOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice, int counter) throws IOException {
         getCache(userDevice).messageCounters.put(contactsDevice, counter);
         if (persistent != null) {
             persistent.storeOmemoMessageCounter(userDevice, contactsDevice, counter);
@@ -149,7 +150,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public int loadOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice) {
+    public int loadOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException {
         Integer counter = getCache(userDevice).messageCounters.get(contactsDevice);
         if (counter == null && persistent != null) {
             counter = persistent.loadOmemoMessageCounter(userDevice, contactsDevice);
@@ -165,7 +166,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public void setDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice from, Date date) {
+    public void setDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice from, Date date) throws IOException {
         getCache(userDevice).lastMessagesDates.put(from, date);
         if (persistent != null) {
             persistent.setDateOfLastReceivedMessage(userDevice, from, date);
@@ -173,7 +174,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public Date getDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice from) {
+    public Date getDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice from) throws IOException {
         Date last = getCache(userDevice).lastMessagesDates.get(from);
 
         if (last == null && persistent != null) {
@@ -187,7 +188,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public void setDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) {
+    public void setDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) throws IOException {
         getCache(userDevice).lastDeviceIdPublicationDates.put(contactsDevice, date);
         if (persistent != null) {
             persistent.setDateOfLastReceivedMessage(userDevice, contactsDevice, date);
@@ -195,7 +196,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public Date getDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice) {
+    public Date getDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException {
         Date last = getCache(userDevice).lastDeviceIdPublicationDates.get(contactsDevice);
 
         if (last == null && persistent != null) {
@@ -209,7 +210,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public void setDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice, Date date) {
+    public void setDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice, Date date) throws IOException {
         getCache(userDevice).lastRenewalDate = date;
         if (persistent != null) {
             persistent.setDateOfLastSignedPreKeyRenewal(userDevice, date);
@@ -217,7 +218,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public Date getDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice) {
+    public Date getDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice) throws IOException {
         Date lastRenewal = getCache(userDevice).lastRenewalDate;
 
         if (lastRenewal == null && persistent != null) {
@@ -231,7 +232,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public T_PreKey loadOmemoPreKey(OmemoDevice userDevice, int preKeyId) {
+    public T_PreKey loadOmemoPreKey(OmemoDevice userDevice, int preKeyId) throws IOException {
         T_PreKey preKey = getCache(userDevice).preKeys.get(preKeyId);
 
         if (preKey == null && persistent != null) {
@@ -245,7 +246,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public void storeOmemoPreKey(OmemoDevice userDevice, int preKeyId, T_PreKey t_preKey) {
+    public void storeOmemoPreKey(OmemoDevice userDevice, int preKeyId, T_PreKey t_preKey) throws IOException {
         getCache(userDevice).preKeys.put(preKeyId, t_preKey);
         if (persistent != null) {
             persistent.storeOmemoPreKey(userDevice, preKeyId, t_preKey);
@@ -261,7 +262,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public TreeMap<Integer, T_PreKey> loadOmemoPreKeys(OmemoDevice userDevice) {
+    public TreeMap<Integer, T_PreKey> loadOmemoPreKeys(OmemoDevice userDevice) throws IOException {
         TreeMap<Integer, T_PreKey> preKeys = getCache(userDevice).preKeys;
 
         if (preKeys.isEmpty() && persistent != null) {
@@ -272,7 +273,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public T_SigPreKey loadOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId) {
+    public T_SigPreKey loadOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId) throws IOException {
         T_SigPreKey sigPreKey = getCache(userDevice).signedPreKeys.get(signedPreKeyId);
 
         if (sigPreKey == null && persistent != null) {
@@ -286,7 +287,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public TreeMap<Integer, T_SigPreKey> loadOmemoSignedPreKeys(OmemoDevice userDevice) {
+    public TreeMap<Integer, T_SigPreKey> loadOmemoSignedPreKeys(OmemoDevice userDevice) throws IOException {
         TreeMap<Integer, T_SigPreKey> sigPreKeys = getCache(userDevice).signedPreKeys;
 
         if (sigPreKeys.isEmpty() && persistent != null) {
@@ -299,7 +300,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     @Override
     public void storeOmemoSignedPreKey(OmemoDevice userDevice,
                                        int signedPreKeyId,
-                                       T_SigPreKey signedPreKey) {
+                                       T_SigPreKey signedPreKey) throws IOException {
         getCache(userDevice).signedPreKeys.put(signedPreKeyId, signedPreKey);
         if (persistent != null) {
             persistent.storeOmemoSignedPreKey(userDevice, signedPreKeyId, signedPreKey);
@@ -315,7 +316,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public T_Sess loadRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice) {
+    public T_Sess loadRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException {
         HashMap<Integer, T_Sess> contactSessions = getCache(userDevice).sessions.get(contactsDevice.getJid());
         if (contactSessions == null) {
             contactSessions = new HashMap<>();
@@ -334,7 +335,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public HashMap<Integer, T_Sess> loadAllRawSessionsOf(OmemoDevice userDevice, BareJid contact) {
+    public HashMap<Integer, T_Sess> loadAllRawSessionsOf(OmemoDevice userDevice, BareJid contact) throws IOException {
         HashMap<Integer, T_Sess> sessions = getCache(userDevice).sessions.get(contact);
         if (sessions == null) {
             sessions = new HashMap<>();
@@ -349,7 +350,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public void storeRawSession(OmemoDevice userDevice, OmemoDevice contactsDevicece, T_Sess session) {
+    public void storeRawSession(OmemoDevice userDevice, OmemoDevice contactsDevicece, T_Sess session) throws IOException {
         HashMap<Integer, T_Sess> sessions = getCache(userDevice).sessions.get(contactsDevicece.getJid());
         if (sessions == null) {
             sessions = new HashMap<>();
@@ -391,7 +392,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     @Override
-    public OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice, BareJid contact) {
+    public OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice, BareJid contact) throws IOException {
         OmemoCachedDeviceList list = getCache(userDevice).deviceLists.get(contact);
 
         if (list == null && persistent != null) {
@@ -407,7 +408,7 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     @Override
     public void storeCachedDeviceList(OmemoDevice userDevice,
                                       BareJid contact,
-                                      OmemoCachedDeviceList deviceList) {
+                                      OmemoCachedDeviceList deviceList) throws IOException {
         getCache(userDevice).deviceLists.put(contact, new OmemoCachedDeviceList(deviceList));
 
         if (persistent != null) {

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/FileBasedOmemoStore.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2017 Paul Schaub
+ * Copyright 2017 Paul Schaub, 2019 Florian Schmaus.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import java.io.DataOutputStream;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Collections;
@@ -36,7 +35,6 @@ import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.util.CloseableUtil;
 import org.jivesoftware.smack.util.stringencoder.BareJidEncoder;
 
 import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
@@ -67,13 +65,13 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
 
     @Override
     public T_IdKeyPair loadOmemoIdentityKeyPair(OmemoDevice userDevice)
-            throws CorruptedOmemoKeyException {
+            throws CorruptedOmemoKeyException, IOException {
         File identityKeyPairPath = hierarchy.getIdentityKeyPairPath(userDevice);
         return keyUtil().identityKeyPairFromBytes(readBytes(identityKeyPairPath));
     }
 
     @Override
-    public void storeOmemoIdentityKeyPair(OmemoDevice userDevice, T_IdKeyPair identityKeyPair) {
+    public void storeOmemoIdentityKeyPair(OmemoDevice userDevice, T_IdKeyPair identityKeyPair) throws IOException {
         File identityKeyPairPath = hierarchy.getIdentityKeyPairPath(userDevice);
         writeBytes(identityKeyPairPath, keyUtil().identityKeyPairToBytes(identityKeyPair));
     }
@@ -88,14 +86,14 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
 
     @Override
     public T_IdKey loadOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice contactsDevice)
-            throws CorruptedOmemoKeyException {
+            throws CorruptedOmemoKeyException, IOException {
         File identityKeyPath = hierarchy.getContactsIdentityKeyPath(userDevice, contactsDevice);
         byte[] bytes = readBytes(identityKeyPath);
         return bytes != null ? keyUtil().identityKeyFromBytes(bytes) : null;
     }
 
     @Override
-    public void storeOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice contactsDevice, T_IdKey t_idKey) {
+    public void storeOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice contactsDevice, T_IdKey t_idKey) throws IOException {
         File identityKeyPath = hierarchy.getContactsIdentityKeyPath(userDevice, contactsDevice);
         writeBytes(identityKeyPath, keyUtil().identityKeyToBytes(t_idKey));
     }
@@ -126,46 +124,46 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public void setDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) {
+    public void setDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) throws IOException {
         File lastMessageReceived = hierarchy.getLastMessageReceivedDatePath(userDevice, contactsDevice);
         writeLong(lastMessageReceived, date.getTime());
     }
 
     @Override
-    public Date getDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice) {
+    public Date getDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException {
         File lastMessageReceived = hierarchy.getLastMessageReceivedDatePath(userDevice, contactsDevice);
         Long date = readLong(lastMessageReceived);
         return date != null ? new Date(date) : null;
     }
 
     @Override
-    public void setDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) {
+    public void setDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) throws IOException {
         File lastDeviceIdPublished = hierarchy.getLastDeviceIdPublicationDatePath(userDevice, contactsDevice);
         writeLong(lastDeviceIdPublished, date.getTime());
     }
 
     @Override
-    public Date getDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice) {
+    public Date getDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException {
         File lastDeviceIdPublished = hierarchy.getLastDeviceIdPublicationDatePath(userDevice, contactsDevice);
         Long date = readLong(lastDeviceIdPublished);
         return date != null ? new Date(date) : null;
     }
 
     @Override
-    public void setDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice, Date date) {
+    public void setDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice, Date date) throws IOException {
         File lastSignedPreKeyRenewal = hierarchy.getLastSignedPreKeyRenewal(userDevice);
         writeLong(lastSignedPreKeyRenewal, date.getTime());
     }
 
     @Override
-    public Date getDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice) {
+    public Date getDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice) throws IOException {
         File lastSignedPreKeyRenewal = hierarchy.getLastSignedPreKeyRenewal(userDevice);
         Long date = readLong(lastSignedPreKeyRenewal);
         return date != null ? new Date(date) : null;
     }
 
     @Override
-    public T_PreKey loadOmemoPreKey(OmemoDevice userDevice, int preKeyId) {
+    public T_PreKey loadOmemoPreKey(OmemoDevice userDevice, int preKeyId) throws IOException {
         File preKeyPath = hierarchy.getPreKeyPath(userDevice, preKeyId);
         byte[] bytes = readBytes(preKeyPath);
 
@@ -181,7 +179,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public void storeOmemoPreKey(OmemoDevice userDevice, int preKeyId, T_PreKey t_preKey) {
+    public void storeOmemoPreKey(OmemoDevice userDevice, int preKeyId, T_PreKey t_preKey) throws IOException {
         File preKeyPath = hierarchy.getPreKeyPath(userDevice, preKeyId);
         writeBytes(preKeyPath, keyUtil().preKeyToBytes(t_preKey));
     }
@@ -195,7 +193,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public TreeMap<Integer, T_PreKey> loadOmemoPreKeys(OmemoDevice userDevice) {
+    public TreeMap<Integer, T_PreKey> loadOmemoPreKeys(OmemoDevice userDevice) throws IOException {
         File preKeyDirectory = hierarchy.getPreKeysDirectory(userDevice);
         TreeMap<Integer, T_PreKey> preKeys = new TreeMap<>();
 
@@ -221,7 +219,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public T_SigPreKey loadOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId) {
+    public T_SigPreKey loadOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId) throws IOException {
         File signedPreKeyPath = new File(hierarchy.getSignedPreKeysDirectory(userDevice), Integer.toString(signedPreKeyId));
         byte[] bytes = readBytes(signedPreKeyPath);
         if (bytes != null) {
@@ -235,7 +233,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public TreeMap<Integer, T_SigPreKey> loadOmemoSignedPreKeys(OmemoDevice userDevice) {
+    public TreeMap<Integer, T_SigPreKey> loadOmemoSignedPreKeys(OmemoDevice userDevice) throws IOException {
         File signedPreKeysDirectory = hierarchy.getSignedPreKeysDirectory(userDevice);
         TreeMap<Integer, T_SigPreKey> signedPreKeys = new TreeMap<>();
 
@@ -263,7 +261,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     @Override
     public void storeOmemoSignedPreKey(OmemoDevice userDevice,
                                        int signedPreKeyId,
-                                       T_SigPreKey signedPreKey) {
+                                       T_SigPreKey signedPreKey) throws IOException {
         File signedPreKeyPath = new File(hierarchy.getSignedPreKeysDirectory(userDevice), Integer.toString(signedPreKeyId));
         writeBytes(signedPreKeyPath, keyUtil().signedPreKeyToBytes(signedPreKey));
     }
@@ -277,7 +275,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public T_Sess loadRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice) {
+    public T_Sess loadRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException {
         File sessionPath = hierarchy.getContactsSessionPath(userDevice, contactsDevice);
         byte[] bytes = readBytes(sessionPath);
         if (bytes != null) {
@@ -291,7 +289,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public HashMap<Integer, T_Sess> loadAllRawSessionsOf(OmemoDevice userDevice, BareJid contact) {
+    public HashMap<Integer, T_Sess> loadAllRawSessionsOf(OmemoDevice userDevice, BareJid contact) throws IOException {
         File contactsDirectory = hierarchy.getContactsDir(userDevice, contact);
         HashMap<Integer, T_Sess> sessions = new HashMap<>();
         String[] devices = contactsDirectory.list();
@@ -322,7 +320,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public void storeRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice, T_Sess session) {
+    public void storeRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice, T_Sess session) throws IOException {
         File sessionPath = hierarchy.getContactsSessionPath(userDevice, contactsDevice);
         writeBytes(sessionPath, keyUtil().rawSessionToBytes(session));
     }
@@ -357,13 +355,13 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public void storeOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice, int counter) {
+    public void storeOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice, int counter) throws IOException {
         File messageCounterFile = hierarchy.getDevicesMessageCounterPath(userDevice, contactsDevice);
         writeIntegers(messageCounterFile, Collections.singleton(counter));
     }
 
     @Override
-    public int loadOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice) {
+    public int loadOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException {
         File messageCounterFile = hierarchy.getDevicesMessageCounterPath(userDevice, contactsDevice);
         Set<Integer> integers = readIntegers(messageCounterFile);
 
@@ -375,7 +373,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     }
 
     @Override
-    public OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice, BareJid contact) {
+    public OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice, BareJid contact) throws IOException {
         OmemoCachedDeviceList cachedDeviceList = new OmemoCachedDeviceList();
 
         if (contact == null) {
@@ -402,7 +400,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
     @Override
     public void storeCachedDeviceList(OmemoDevice userDevice,
                                       BareJid contact,
-                                      OmemoCachedDeviceList contactsDeviceList) {
+                                      OmemoCachedDeviceList contactsDeviceList) throws IOException {
         if (contact == null) {
             return;
         }
@@ -420,166 +418,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
         deleteDirectory(deviceDirectory);
     }
 
-    private static void writeLong(File target, long i) {
+    private static void writeLong(File target, long i) throws IOException {
-        if (target == null) {
-            LOGGER.log(Level.WARNING, "Could not write long to null-path.");
-            return;
-        }
-
-        try {
-            FileHierarchy.createFile(target);
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Could not create file.", e);
-            return;
-        }
-
-        DataOutputStream out = null;
-        try {
-            out = new DataOutputStream(new FileOutputStream(target));
-            out.writeLong(i);
-
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Could not write longs to file.", e);
-        } finally {
-            CloseableUtil.maybeClose(out, LOGGER);
-        }
-    }
-
-    private static Long readLong(File target) {
-        if (target == null) {
-            LOGGER.log(Level.WARNING, "Could not read long from null-path.");
-            return null;
-        }
-
-        Long l;
-        DataInputStream in = null;
-
-        try {
-            in = new DataInputStream(new FileInputStream(target));
-            l = in.readLong();
-        } catch (FileNotFoundException e) {
-            l = null;
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Could not read long from file.", e);
-            return null;
-        } finally {
-            CloseableUtil.maybeClose(in, LOGGER);
-        }
-
-        return l;
-    }
-
-    private static void writeBytes(File target, byte[] bytes) {
-        if (target == null) {
-            LOGGER.log(Level.WARNING, "Could not write bytes to null-path.");
-            return;
-        }
-
-        // Create file
-        try {
-            FileHierarchy.createFile(target);
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Could not create file.", e);
-            return;
-        }
-
-        DataOutputStream out = null;
-
-        try {
-            out = new DataOutputStream(new FileOutputStream(target));
-            out.write(bytes);
-
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Could not write bytes to file.", e);
-        } finally {
-            CloseableUtil.maybeClose(out, LOGGER);
-        }
-    }
-
-    private static byte[] readBytes(File target) {
-        if (target == null) {
-            LOGGER.log(Level.WARNING, "Could not read bytes from null-path.");
-            return null;
-        }
-
-        byte[] b = null;
-        DataInputStream in = null;
-
-        try {
-            in = new DataInputStream(new FileInputStream(target));
-            b = new byte[(int) target.length()];
-            in.read(b);
-        } catch (FileNotFoundException e) {
-            b = null;
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Could not read bytes from file.", e);
-        } finally {
-            CloseableUtil.maybeClose(in, LOGGER);
-        }
-
-        return b;
-    }
-
-    private static void writeIntegers(File target, Set<Integer> integers) {
-        if (target == null) {
-            LOGGER.log(Level.WARNING, "Could not write integers to null-path.");
-            return;
-        }
-
-        DataOutputStream out = null;
-
-        try {
-            out = new DataOutputStream(new FileOutputStream(target));
-            for (int i : integers) {
-                out.writeInt(i);
-            }
-
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Could not write integers to file.", e);
-        } finally {
-            CloseableUtil.maybeClose(out, LOGGER);
-        }
-    }
-
-    private static Set<Integer> readIntegers(File target) {
-        if (target == null) {
-            LOGGER.log(Level.WARNING, "Could not read integers from null-path.");
-            return null;
-        }
-
-        HashSet<Integer> integers = new HashSet<>();
-        DataInputStream in = null;
-
-        try {
-            in = new DataInputStream(new FileInputStream(target));
-
-            try {
-                while (true) {
-                    integers.add(in.readInt());
-                }
-            } catch (EOFException e) {
-                // Reached end of the list.
-            }
-
-        } catch (FileNotFoundException e) {
-            integers = null;
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Could not read integers.", e);
-        } finally {
-            CloseableUtil.maybeClose(in, LOGGER);
-        }
-
-        return integers;
-    }
-
-    /**
-     * One day... *sheds a tear*
-     * TODO Use methods below once Smack's minimum Android API level is 19 or higher
-     */
-    /*
-    private static void writeLong(File target, long i)
-            throws IOException
-    {
         if (target == null) {
             throw new IOException("Could not write long to null-path.");
         }
@@ -591,9 +430,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
         }
     }
 
-    private static Long readLong(File target)
+    private static Long readLong(File target) throws IOException {
-            throws IOException
-    {
         if (target == null) {
             throw new IOException("Could not read long from null-path.");
         }
@@ -607,9 +444,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
         }
     }
 
-    private static void writeBytes(File target, byte[] bytes)
+    private static void writeBytes(File target, byte[] bytes) throws IOException {
-            throws IOException
-    {
         if (target == null) {
             throw new IOException("Could not write bytes to null-path.");
         }
@@ -622,9 +457,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
         }
     }
 
-    private static byte[] readBytes(File target)
+    private static byte[] readBytes(File target) throws IOException {
-            throws IOException
-    {
         if (target == null) {
             throw new IOException("Could not read bytes from null-path.");
         }
@@ -641,9 +474,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
         return b;
     }
 
-    private static void writeIntegers(File target, Set<Integer> integers)
+    private static void writeIntegers(File target, Set<Integer> integers) throws IOException {
-            throws IOException
-    {
         if (target == null) {
             throw new IOException("Could not write integers to null-path.");
         }
@@ -657,9 +488,7 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
         }
     }
 
-    private static Set<Integer> readIntegers(File target)
+    private static Set<Integer> readIntegers(File target) throws IOException {
-            throws IOException
-    {
         if (target == null) {
             throw new IOException("Could not write integers to null-path.");
         }
@@ -682,7 +511,6 @@ public abstract class FileBasedOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigP
 
         return integers;
     }
-     */
 
     /**
      * Delete a directory with all subdirectories.

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java

@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.omemo;
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.OMEMO_NAMESPACE_V_AXOLOTL;
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.PEP_NODE_DEVICE_LIST_NOTIFY;
 
+import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -96,7 +97,6 @@ public final class OmemoManager extends Manager {
     private static final Logger LOGGER = Logger.getLogger(OmemoManager.class.getName());
 
     private static final Integer UNKNOWN_DEVICE_ID = -1;
-    final Object LOCK = new Object();
 
     private static final WeakHashMap<XMPPConnection, TreeMap<Integer, OmemoManager>> INSTANCES = new WeakHashMap<>();
     private final OmemoService<?, ?, ?, ?, ?, ?, ?, ?, ?> service;
@@ -234,12 +234,12 @@ public final class OmemoManager extends Manager {
      * @throws XMPPException.XMPPErrorException
      * @throws SmackException.NotLoggedInException
      * @throws PubSubException.NotALeafNodeException
+     * @throws IOException
      */
-    public void initialize()
+    public synchronized void initialize()
             throws SmackException.NotLoggedInException, CorruptedOmemoKeyException, InterruptedException,
             SmackException.NoResponseException, SmackException.NotConnectedException, XMPPException.XMPPErrorException,
-            PubSubException.NotALeafNodeException {
+            PubSubException.NotALeafNodeException, IOException {
-        synchronized (LOCK) {
         if (!connection().isAuthenticated()) {
             throw new SmackException.NotLoggedInException();
         }
@@ -251,7 +251,6 @@ public final class OmemoManager extends Manager {
         getOmemoService().init(new LoggedInOmemoManager(this));
         ServiceDiscoveryManager.getInstanceFor(connection()).addFeature(PEP_NODE_DEVICE_LIST_NOTIFY);
     }
-    }
 
     /**
      * Initialize the manager without blocking. Once the manager is successfully initialized, the finishedCallback will
@@ -279,8 +278,9 @@ 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
      */
-    public Set<OmemoDevice> getDevicesOf(BareJid contact) {
+    public Set<OmemoDevice> getDevicesOf(BareJid contact) throws IOException {
         OmemoCachedDeviceList list = getOmemoService().getOmemoStoreBackend().loadCachedDeviceList(getOwnDevice(), contact);
         HashSet<OmemoDevice> devices = new HashSet<>();
 
@@ -304,17 +304,16 @@ public final class OmemoManager extends Manager {
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
      * @throws SmackException.NotLoggedInException
+     * @throws IOException
      */
     public OmemoMessage.Sent encrypt(BareJid recipient, String message)
             throws CryptoFailedException, UndecidedOmemoIdentityException,
             InterruptedException, SmackException.NotConnectedException,
-            SmackException.NoResponseException, SmackException.NotLoggedInException {
+            SmackException.NoResponseException, SmackException.NotLoggedInException, IOException {
-        synchronized (LOCK) {
             Set<BareJid> recipients = new HashSet<>();
             recipients.add(recipient);
             return encrypt(recipients, message);
     }
-    }
 
     /**
      * OMEMO encrypt a cleartext message for multiple recipients.
@@ -328,12 +327,12 @@ public final class OmemoManager extends Manager {
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
      * @throws SmackException.NotLoggedInException
+     * @throws IOException
      */
-    public OmemoMessage.Sent encrypt(Set<BareJid> recipients, String message)
+    public synchronized OmemoMessage.Sent encrypt(Set<BareJid> recipients, String message)
             throws CryptoFailedException, UndecidedOmemoIdentityException,
             InterruptedException, SmackException.NotConnectedException,
-            SmackException.NoResponseException, SmackException.NotLoggedInException {
+            SmackException.NoResponseException, SmackException.NotLoggedInException, IOException {
-        synchronized (LOCK) {
         LoggedInOmemoManager guard = new LoggedInOmemoManager(this);
         Set<OmemoDevice> devices = getDevicesOf(getOwnJid());
         for (BareJid recipient : recipients) {
@@ -341,7 +340,6 @@ public final class OmemoManager extends Manager {
         }
         return service.createOmemoMessage(guard, devices, message);
     }
-    }
 
     /**
      * Encrypt a message for all recipients in the MultiUserChat.
@@ -357,13 +355,13 @@ public final class OmemoManager extends Manager {
      * @throws SmackException.NoResponseException
      * @throws NoOmemoSupportException When the muc doesn't support OMEMO.
      * @throws SmackException.NotLoggedInException
+     * @throws IOException
      */
-    public OmemoMessage.Sent encrypt(MultiUserChat muc, String message)
+    public synchronized OmemoMessage.Sent encrypt(MultiUserChat muc, String message)
             throws UndecidedOmemoIdentityException, CryptoFailedException,
             XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,
             SmackException.NoResponseException, NoOmemoSupportException,
-            SmackException.NotLoggedInException {
+            SmackException.NotLoggedInException, IOException {
-        synchronized (LOCK) {
         if (!multiUserChatSupportsOmemo(muc)) {
             throw new NoOmemoSupportException();
         }
@@ -375,7 +373,6 @@ public final class OmemoManager extends Manager {
         }
         return encrypt(recipients, message);
     }
-    }
 
     /**
      * Manually decrypt an OmemoElement.
@@ -390,10 +387,11 @@ 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
      */
     public OmemoMessage.Received decrypt(BareJid sender, OmemoElement omemoElement)
             throws SmackException.NotLoggedInException, CorruptedOmemoKeyException, NoRawSessionException,
-            CryptoFailedException {
+            CryptoFailedException, IOException {
         LoggedInOmemoManager managerGuard = new LoggedInOmemoManager(this);
         return getOmemoService().decryptMessage(managerGuard, sender, omemoElement);
     }
@@ -404,9 +402,10 @@ 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
      */
     public List<MessageOrOmemoMessage> decryptMamQueryResult(MamManager.MamQuery mamQuery)
-            throws SmackException.NotLoggedInException {
+            throws SmackException.NotLoggedInException, IOException {
         return new ArrayList<>(getOmemoService().decryptMamQueryResult(new LoggedInOmemoManager(this), mamQuery));
     }
 
@@ -486,25 +485,23 @@ public final class OmemoManager extends Manager {
      * @throws SmackException.NoResponseException
      * @throws NoSuchAlgorithmException
      * @throws SmackException.NotConnectedException
+     * @throws IOException
      */
-    public void sendRatchetUpdateMessage(OmemoDevice recipient)
+    public synchronized void sendRatchetUpdateMessage(OmemoDevice recipient)
             throws SmackException.NotLoggedInException, CorruptedOmemoKeyException, InterruptedException,
             SmackException.NoResponseException, NoSuchAlgorithmException, SmackException.NotConnectedException,
-            CryptoFailedException, CannotEstablishOmemoSessionException {
+            CryptoFailedException, CannotEstablishOmemoSessionException, IOException {
-        synchronized (LOCK) {
         Message message = new Message();
         message.setFrom(getOwnJid());
         message.setTo(recipient.getJid());
 
-            OmemoElement element = getOmemoService()
+        OmemoElement element = getOmemoService().createRatchetUpdateElement(new LoggedInOmemoManager(this), recipient);
-                    .createRatchetUpdateElement(new LoggedInOmemoManager(this), recipient);
         message.addExtension(element);
 
         // Set MAM Storage hint
         StoreHint.set(message);
         connection().sendStanza(message);
     }
-    }
 
     /**
      * Returns true, if the contact has any active devices published in a deviceList.
@@ -516,15 +513,14 @@ public final class OmemoManager extends Manager {
      * @throws SmackException.NoResponseException
      * @throws PubSubException.NotALeafNodeException
      * @throws XMPPException.XMPPErrorException
+     * @throws IOException
      */
-    public boolean contactSupportsOmemo(BareJid contact)
+    public synchronized boolean contactSupportsOmemo(BareJid contact)
             throws InterruptedException, PubSubException.NotALeafNodeException, XMPPException.XMPPErrorException,
-            SmackException.NotConnectedException, SmackException.NoResponseException {
+            SmackException.NotConnectedException, SmackException.NoResponseException, IOException {
-        synchronized (LOCK) {
         OmemoCachedDeviceList deviceList = getOmemoService().refreshDeviceList(connection(), getOwnDevice(), contact);
         return !deviceList.getActiveDevices().isEmpty();
     }
-    }
 
     /**
      * Returns true, if the MUC with the EntityBareJid multiUserChat is non-anonymous and members only (prerequisite
@@ -569,17 +565,16 @@ public final class OmemoManager extends Manager {
      * @return fingerprint
      * @throws SmackException.NotLoggedInException if we don't know our bareJid yet.
      * @throws CorruptedOmemoKeyException if our identityKey is corrupted.
+     * @throws IOException
      */
-    public OmemoFingerprint getOwnFingerprint()
+    public synchronized OmemoFingerprint getOwnFingerprint()
-            throws SmackException.NotLoggedInException, CorruptedOmemoKeyException {
+            throws SmackException.NotLoggedInException, CorruptedOmemoKeyException, IOException {
-        synchronized (LOCK) {
         if (getOwnJid() == null) {
             throw new SmackException.NotLoggedInException();
         }
 
         return getOmemoService().getOmemoStoreBackend().getFingerprint(getOwnDevice());
     }
-    }
 
     /**
      * Get the fingerprint of a contacts device.
@@ -591,12 +586,12 @@ public final class OmemoManager extends Manager {
      * @throws SmackException.NotConnectedException
      * @throws InterruptedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
      */
-    public OmemoFingerprint getFingerprint(OmemoDevice device)
+    public synchronized OmemoFingerprint getFingerprint(OmemoDevice device)
             throws CannotEstablishOmemoSessionException, SmackException.NotLoggedInException,
             CorruptedOmemoKeyException, SmackException.NotConnectedException, InterruptedException,
-            SmackException.NoResponseException {
+            SmackException.NoResponseException, IOException {
-        synchronized (LOCK) {
         if (getOwnJid() == null) {
             throw new SmackException.NotLoggedInException();
         }
@@ -605,8 +600,8 @@ public final class OmemoManager extends Manager {
             return getOwnFingerprint();
         }
 
-            return getOmemoService().getOmemoStoreBackend().getFingerprintAndMaybeBuildSession(new LoggedInOmemoManager(this), device);
+        return getOmemoService().getOmemoStoreBackend()
-        }
+                .getFingerprintAndMaybeBuildSession(new LoggedInOmemoManager(this), device);
     }
 
     /**
@@ -621,19 +616,19 @@ public final class OmemoManager extends Manager {
      * @throws SmackException.NotConnectedException
      * @throws InterruptedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
      */
-    public HashMap<OmemoDevice, OmemoFingerprint> getActiveFingerprints(BareJid contact)
+    public synchronized HashMap<OmemoDevice, OmemoFingerprint> getActiveFingerprints(BareJid contact)
             throws SmackException.NotLoggedInException, CorruptedOmemoKeyException,
             CannotEstablishOmemoSessionException, SmackException.NotConnectedException, InterruptedException,
-            SmackException.NoResponseException {
+            SmackException.NoResponseException, IOException {
-        synchronized (LOCK) {
         if (getOwnJid() == null) {
             throw new SmackException.NotLoggedInException();
         }
 
         HashMap<OmemoDevice, OmemoFingerprint> fingerprints = new HashMap<>();
-            OmemoCachedDeviceList deviceList = getOmemoService().getOmemoStoreBackend()
+        OmemoCachedDeviceList deviceList = getOmemoService().getOmemoStoreBackend().loadCachedDeviceList(getOwnDevice(),
-                    .loadCachedDeviceList(getOwnDevice(), contact);
+                contact);
 
         for (int id : deviceList.getActiveDevices()) {
             OmemoDevice device = new OmemoDevice(contact, id);
@@ -646,7 +641,6 @@ public final class OmemoManager extends Manager {
 
         return fingerprints;
     }
-    }
 
     /**
      * Add an OmemoMessageListener. This listener will be informed about incoming OMEMO messages
@@ -692,14 +686,13 @@ public final class OmemoManager extends Manager {
      * @throws XMPPException.XMPPErrorException
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
      */
-    public void requestDeviceListUpdateFor(BareJid contact)
+    public synchronized void requestDeviceListUpdateFor(BareJid contact)
             throws InterruptedException, PubSubException.NotALeafNodeException, XMPPException.XMPPErrorException,
-            SmackException.NotConnectedException, SmackException.NoResponseException {
+            SmackException.NotConnectedException, SmackException.NoResponseException, IOException {
-        synchronized (LOCK) {
         getOmemoService().refreshDeviceList(connection(), getOwnDevice(), contact);
     }
-    }
 
     /**
      * Publish a new device list with just our own deviceId in it.
@@ -709,14 +702,14 @@ public final class OmemoManager extends Manager {
      * @throws XMPPException.XMPPErrorException
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
+     * @throws PubSubException.NotALeafNodeException
      */
     public void purgeDeviceList()
             throws SmackException.NotLoggedInException, InterruptedException, XMPPException.XMPPErrorException,
-            SmackException.NotConnectedException, SmackException.NoResponseException {
+            SmackException.NotConnectedException, SmackException.NoResponseException, IOException, PubSubException.NotALeafNodeException {
-        synchronized (LOCK) {
         getOmemoService().purgeDeviceList(new LoggedInOmemoManager(this));
     }
-    }
 
     /**
      * Rotate the signedPreKey published in our OmemoBundle and republish it. This should be done every now and
@@ -729,11 +722,13 @@ public final class OmemoManager extends Manager {
      * @throws SmackException.NotConnectedException XMPP error
      * @throws SmackException.NoResponseException XMPP error
      * @throws SmackException.NotLoggedInException
+     * @throws IOException
+     * @throws PubSubException.NotALeafNodeException
      */
-    public void rotateSignedPreKey()
+    public synchronized void rotateSignedPreKey()
             throws CorruptedOmemoKeyException, SmackException.NotLoggedInException, XMPPException.XMPPErrorException,
-            SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException {
+                    SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException,
-        synchronized (LOCK) {
+                    IOException, PubSubException.NotALeafNodeException {
         if (!connection().isAuthenticated()) {
             throw new SmackException.NotLoggedInException();
         }
@@ -745,7 +740,6 @@ public final class OmemoManager extends Manager {
         OmemoBundleElement bundle = getOmemoService().getOmemoStoreBackend().packOmemoBundle(getOwnDevice());
         OmemoService.publishBundle(connection(), getOwnDevice(), bundle);
     }
-    }
 
     /**
      * Return true, if the given Stanza contains an OMEMO element 'encrypted'.
@@ -791,40 +785,34 @@ public final class OmemoManager extends Manager {
      *
      * @return deviceId
      */
-    public Integer getDeviceId() {
+    public synchronized Integer getDeviceId() {
-        synchronized (LOCK) {
         return deviceId;
     }
-    }
 
     /**
      * Return the OmemoDevice of the user.
      *
      * @return omemoDevice
      */
-    public OmemoDevice getOwnDevice() {
+    public synchronized OmemoDevice getOwnDevice() {
-        synchronized (LOCK) {
         BareJid jid = getOwnJid();
         if (jid == null) {
             return null;
         }
         return new OmemoDevice(jid, getDeviceId());
     }
-    }
 
     /**
      * Set the deviceId of the manager to nDeviceId.
      * @param nDeviceId new deviceId
      */
-    void setDeviceId(int nDeviceId) {
+    synchronized void setDeviceId(int nDeviceId) {
-        synchronized (LOCK) {
         // Move this instance inside the HashMaps
         INSTANCES.get(connection()).remove(getDeviceId());
         INSTANCES.get(connection()).put(nDeviceId, this);
 
         this.deviceId = nDeviceId;
     }
-    }
 
     /**
      * Notify all registered OmemoMessageListeners about a received OmemoMessage.
@@ -956,8 +944,8 @@ public final class OmemoManager extends Manager {
                     try {
                         getOmemoService().onOmemoMessageStanzaReceived(packet,
                                 new LoggedInOmemoManager(OmemoManager.this));
-                    } catch (SmackException.NotLoggedInException e) {
+                    } catch (SmackException.NotLoggedInException | IOException e) {
-                        LOGGER.warning("Received OMEMO stanza while being offline: " + e);
+                        LOGGER.log(Level.SEVERE, "Exception while processing OMEMO stanza", e);
                     }
                 }
             });
@@ -979,8 +967,8 @@ public final class OmemoManager extends Manager {
                         try {
                             getOmemoService().onOmemoCarbonCopyReceived(direction, carbonCopy, wrappingMessage,
                                     new LoggedInOmemoManager(OmemoManager.this));
-                        } catch (SmackException.NotLoggedInException e) {
+                        } catch (SmackException.NotLoggedInException | IOException e) {
-                            LOGGER.warning("Received OMEMO carbon copy while being offline: " + e);
+                            LOGGER.log(Level.SEVERE, "Exception while processing OMEMO stanza", e);
                         }
                     }
                 }
@@ -1018,14 +1006,23 @@ public final class OmemoManager extends Manager {
                     }
 
                     // Device List <list>
+                    OmemoCachedDeviceList deviceList;
                     OmemoDeviceListElement receivedDeviceList = (OmemoDeviceListElement) payloadItem.getPayload();
-                    getOmemoService().getOmemoStoreBackend().mergeCachedDeviceList(getOwnDevice(), from, receivedDeviceList);
+                    try {
+                        getOmemoService().getOmemoStoreBackend().mergeCachedDeviceList(getOwnDevice(), from,
+                                        receivedDeviceList);
 
                         if (!from.asBareJid().equals(getOwnJid())) {
                             continue;
                         }
 
-                    OmemoCachedDeviceList deviceList = getOmemoService().cleanUpDeviceList(getOwnDevice());
+                        deviceList = getOmemoService().cleanUpDeviceList(getOwnDevice());
+                    } catch (IOException e) {
+                        LOGGER.log(Level.SEVERE,
+                                        "IOException while processing OMEMO PEP device updates. Message: " + message,
+                                        e);
+                        continue;
+                    }
                     final OmemoDeviceListElement_VAxolotl newDeviceList = new OmemoDeviceListElement_VAxolotl(deviceList);
 
                     if (!newDeviceList.copyDeviceIds().equals(receivedDeviceList.copyDeviceIds())) {
@@ -1038,7 +1035,7 @@ public final class OmemoManager extends Manager {
                                 try {
                                     OmemoService.publishDeviceList(connection(), newDeviceList);
                                 } catch (InterruptedException | XMPPException.XMPPErrorException |
-                                        SmackException.NotConnectedException | SmackException.NoResponseException e) {
+                                        SmackException.NotConnectedException | SmackException.NoResponseException | PubSubException.NotALeafNodeException e) {
                                     LOGGER.log(Level.WARNING, "Could not publish our deviceList upon an received update.", e);
                                 }
                             }

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoRatchet.java

@@ -16,6 +16,7 @@
  */
 package org.jivesoftware.smackx.omemo;
 
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -65,10 +66,11 @@ public abstract class OmemoRatchet<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws NoRawSessionException when no double ratchet session was found.
      * @throws CryptoFailedException
      * @throws UntrustedOmemoIdentityException
+     * @throws IOException
      */
     public abstract byte[] doubleRatchetDecrypt(OmemoDevice sender, byte[] encryptedKey)
             throws CorruptedOmemoKeyException, NoRawSessionException, CryptoFailedException,
-            UntrustedOmemoIdentityException;
+            UntrustedOmemoIdentityException, IOException;
 
     /**
      * Encrypt a messageKey with the double ratchet session of the recipient.
@@ -86,9 +88,10 @@ 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
      */
     CipherAndAuthTag retrieveMessageKeyAndAuthTag(OmemoDevice sender, OmemoElement element) throws CryptoFailedException,
-            NoRawSessionException {
+            NoRawSessionException, IOException {
         int keyId = omemoManager.getDeviceId();
         byte[] unpackedKey = null;
         List<CryptoFailedException> decryptExceptions = new ArrayList<>();

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java

@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.omemo;
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.KEYLENGTH;
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.KEYTYPE;
 
+import java.io.IOException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -73,9 +74,11 @@ import org.jivesoftware.smackx.omemo.trust.TrustState;
 import org.jivesoftware.smackx.omemo.util.MessageOrOmemoMessage;
 import org.jivesoftware.smackx.omemo.util.OmemoConstants;
 import org.jivesoftware.smackx.omemo.util.OmemoMessageBuilder;
+import org.jivesoftware.smackx.pep.PepManager;
 import org.jivesoftware.smackx.pubsub.LeafNode;
 import org.jivesoftware.smackx.pubsub.PayloadItem;
 import org.jivesoftware.smackx.pubsub.PubSubException;
+import org.jivesoftware.smackx.pubsub.PubSubException.NotALeafNodeException;
 import org.jivesoftware.smackx.pubsub.PubSubManager;
 
 import org.jxmpp.jid.BareJid;
@@ -234,11 +237,12 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
      * @throws PubSubException.NotALeafNodeException
+     * @throws IOException
      */
     void init(OmemoManager.LoggedInOmemoManager managerGuard)
             throws InterruptedException, CorruptedOmemoKeyException, XMPPException.XMPPErrorException,
             SmackException.NotConnectedException, SmackException.NoResponseException,
-            PubSubException.NotALeafNodeException {
+            PubSubException.NotALeafNodeException, IOException {
 
         OmemoManager manager = managerGuard.get();
         OmemoDevice userDevice = manager.getOwnDevice();
@@ -273,12 +277,13 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws CorruptedOmemoKeyException if our IdentityKeyPair is corrupted.
      * @throws SmackException.NotConnectedException
      * @throws CannotEstablishOmemoSessionException if session negotiation fails.
+     * @throws IOException
      */
     OmemoElement createRatchetUpdateElement(OmemoManager.LoggedInOmemoManager managerGuard,
                                             OmemoDevice contactsDevice)
             throws InterruptedException, SmackException.NoResponseException, CorruptedOmemoKeyException,
             SmackException.NotConnectedException, CannotEstablishOmemoSessionException, NoSuchAlgorithmException,
-            CryptoFailedException {
+            CryptoFailedException, IOException {
 
         OmemoManager manager = managerGuard.get();
         OmemoDevice userDevice = manager.getOwnDevice();
@@ -334,6 +339,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws SmackException.NoResponseException
      * @throws UndecidedOmemoIdentityException if the list of recipient devices contains undecided devices
      * @throws CryptoFailedException if we are lacking some crypto primitives
+     * @throws IOException
      */
     private OmemoMessage.Sent encrypt(OmemoManager.LoggedInOmemoManager managerGuard,
                                       Set<OmemoDevice> contactsDevices,
@@ -341,7 +347,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                                       byte[] iv,
                                       String message)
             throws SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException,
-            UndecidedOmemoIdentityException, CryptoFailedException {
+            UndecidedOmemoIdentityException, CryptoFailedException, IOException {
 
         OmemoManager manager = managerGuard.get();
         OmemoDevice userDevice = manager.getOwnDevice();
@@ -435,11 +441,12 @@ 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
      */
     OmemoMessage.Received decryptMessage(OmemoManager.LoggedInOmemoManager managerGuard,
                                          BareJid senderJid,
                                          OmemoElement omemoElement)
-            throws CorruptedOmemoKeyException, CryptoFailedException, NoRawSessionException {
+            throws CorruptedOmemoKeyException, CryptoFailedException, NoRawSessionException, IOException {
 
         OmemoManager manager = managerGuard.get();
         int senderId = omemoElement.getHeader().getSid();
@@ -488,13 +495,14 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws CryptoFailedException if we are lacking some cryptographic algorithms
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
      */
     OmemoMessage.Sent createKeyTransportElement(OmemoManager.LoggedInOmemoManager managerGuard,
                                                 Set<OmemoDevice> contactsDevices,
                                                 byte[] key,
                                                 byte[] iv)
             throws InterruptedException, UndecidedOmemoIdentityException, CryptoFailedException,
-            SmackException.NotConnectedException, SmackException.NoResponseException {
+            SmackException.NotConnectedException, SmackException.NoResponseException, IOException {
         return encrypt(managerGuard, contactsDevices, key, iv, null);
     }
 
@@ -511,12 +519,13 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws CryptoFailedException if we are lacking some cryptographic algorithms
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
      */
     OmemoMessage.Sent createOmemoMessage(OmemoManager.LoggedInOmemoManager managerGuard,
                                          Set<OmemoDevice> contactsDevices,
                                          String message)
             throws InterruptedException, UndecidedOmemoIdentityException, CryptoFailedException,
-            SmackException.NotConnectedException, SmackException.NoResponseException {
+            SmackException.NotConnectedException, SmackException.NoResponseException, IOException {
 
         byte[] key, iv;
         iv = OmemoMessageBuilder.generateIv();
@@ -574,12 +583,13 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws SmackException.NotConnectedException
      * @throws InterruptedException
      * @throws SmackException.NoResponseException
+     * @throws NotALeafNodeException
      */
     static void publishBundle(XMPPConnection connection, OmemoDevice userDevice, OmemoBundleElement bundle)
             throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,
-            SmackException.NoResponseException {
+            SmackException.NoResponseException, NotALeafNodeException {
-        PubSubManager pm = PubSubManager.getInstanceFor(connection, connection.getUser().asBareJid());
+        PepManager pm = PepManager.getInstanceFor(connection);
-        pm.tryToPublishAndPossibleAutoCreate(userDevice.getBundleNodeName(), new PayloadItem<>(bundle));
+        pm.publish(userDevice.getBundleNodeName(), new PayloadItem<>(bundle));
     }
 
     /**
@@ -628,10 +638,9 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      */
     static void publishDeviceList(XMPPConnection connection, OmemoDeviceListElement deviceList)
             throws InterruptedException, XMPPException.XMPPErrorException, SmackException.NotConnectedException,
-            SmackException.NoResponseException {
+            SmackException.NoResponseException, NotALeafNodeException {
-
+        PepManager pm = PepManager.getInstanceFor(connection);
-        PubSubManager.getInstanceFor(connection, connection.getUser().asBareJid())
+        pm.publish(OmemoConstants.PEP_NODE_DEVICE_LIST, new PayloadItem<>(deviceList));
-                .tryToPublishAndPossibleAutoCreate(OmemoConstants.PEP_NODE_DEVICE_LIST, new PayloadItem<>(deviceList));
     }
 
     /**
@@ -643,10 +652,11 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws XMPPException.XMPPErrorException
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
      */
     private void refreshAndRepublishDeviceList(XMPPConnection connection, OmemoDevice userDevice)
             throws InterruptedException, PubSubException.NotALeafNodeException, XMPPException.XMPPErrorException,
-            SmackException.NotConnectedException, SmackException.NoResponseException {
+            SmackException.NotConnectedException, SmackException.NoResponseException, IOException {
 
         // refreshOmemoDeviceList;
         OmemoDeviceListElement publishedList;
@@ -685,8 +695,9 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      *
      * @param userDevice
      * @return
+     * @throws IOException
      */
-    OmemoCachedDeviceList cleanUpDeviceList(OmemoDevice userDevice) {
+    OmemoCachedDeviceList cleanUpDeviceList(OmemoDevice userDevice) throws IOException {
         OmemoCachedDeviceList cachedDeviceList;
 
         // Delete stale devices if allowed and necessary
@@ -719,10 +730,11 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws XMPPException.XMPPErrorException
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
      */
     OmemoCachedDeviceList refreshDeviceList(XMPPConnection connection, OmemoDevice userDevice, BareJid contact)
             throws InterruptedException, PubSubException.NotALeafNodeException, XMPPException.XMPPErrorException,
-            SmackException.NotConnectedException, SmackException.NoResponseException {
+            SmackException.NotConnectedException, SmackException.NoResponseException, IOException {
         // refreshOmemoDeviceList;
         OmemoDeviceListElement publishedList;
         try {
@@ -790,11 +802,12 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws SmackException.NotConnectedException
      * @throws InterruptedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
      */
     private Set<OmemoDevice> buildMissingSessionsWithDevices(XMPPConnection connection,
                                                              OmemoDevice userDevice,
                                                              Set<OmemoDevice> devices)
-            throws SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException {
+            throws SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException, IOException {
 
         Set<OmemoDevice> devicesWithSession = new HashSet<>();
         for (OmemoDevice device : devices) {
@@ -828,8 +841,9 @@ 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
      */
-    private Set<OmemoDevice> getUndecidedDevices(OmemoDevice userDevice, OmemoTrustCallback callback, Set<OmemoDevice> devices) {
+    private Set<OmemoDevice> getUndecidedDevices(OmemoDevice userDevice, OmemoTrustCallback callback, Set<OmemoDevice> devices) throws IOException {
         Set<OmemoDevice> undecidedDevices = new HashSet<>();
 
         for (OmemoDevice device : devices) {
@@ -858,8 +872,9 @@ 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
      */
-    private boolean hasSession(OmemoDevice userDevice, OmemoDevice contactsDevice) {
+    private boolean hasSession(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException {
         return getOmemoStoreBackend().loadRawSession(userDevice, contactsDevice) != null;
     }
 
@@ -881,8 +896,9 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      *
      * @param userDevice our OmemoDevice
      * @return true if rotation is necessary
+     * @throws IOException
      */
-    private boolean shouldRotateSignedPreKey(OmemoDevice userDevice) {
+    private boolean shouldRotateSignedPreKey(OmemoDevice userDevice) throws IOException {
         if (!OmemoConfiguration.getRenewOldSignedPreKeys()) {
             return false;
         }
@@ -909,8 +925,9 @@ 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
      */
-    private OmemoCachedDeviceList deleteStaleDevices(OmemoDevice userDevice) {
+    private OmemoCachedDeviceList deleteStaleDevices(OmemoDevice userDevice) throws IOException {
         OmemoCachedDeviceList deviceList = getOmemoStoreBackend().loadCachedDeviceList(userDevice);
         int maxAgeHours = OmemoConfiguration.getDeleteStaleDevicesAfterHours();
         return removeStaleDevicesFromDeviceList(userDevice, userDevice.getJid(), deviceList, maxAgeHours);
@@ -928,11 +945,12 @@ 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
      */
     private OmemoCachedDeviceList removeStaleDevicesFromDeviceList(OmemoDevice userDevice,
                                                                    BareJid contact,
                                                                    OmemoCachedDeviceList contactsDeviceList,
-                                                                   int maxAgeHours) {
+                                                                   int maxAgeHours) throws IOException {
         OmemoCachedDeviceList deviceList = new OmemoCachedDeviceList(contactsDeviceList); // Don't work on original list.
 
         // Iterate through original list, but modify copy instead
@@ -1024,9 +1042,10 @@ 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
      */
     List<MessageOrOmemoMessage> decryptMamQueryResult(OmemoManager.LoggedInOmemoManager managerGuard,
-                                                      MamManager.MamQuery mamQuery) {
+                                                      MamManager.MamQuery mamQuery) throws IOException {
         List<MessageOrOmemoMessage> result = new ArrayList<>();
         for (Message message : mamQuery.getMessages()) {
             if (OmemoManager.stanzaContainsOmemoElement(message)) {
@@ -1055,10 +1074,10 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
     public void onOmemoCarbonCopyReceived(CarbonExtension.Direction direction,
                                           Message carbonCopy,
                                           Message wrappingMessage,
-                                          OmemoManager.LoggedInOmemoManager managerGuard) {
+                                          OmemoManager.LoggedInOmemoManager managerGuard) throws IOException {
         OmemoManager manager = managerGuard.get();
         // Avoid the ratchet being manipulated and the bundle being published multiple times simultaneously
-        synchronized (manager.LOCK) {
+        synchronized (manager) {
             OmemoDevice userDevice = manager.getOwnDevice();
             OmemoElement element = carbonCopy.getExtension(OmemoElement.NAME_ENCRYPTED, OmemoElement_VAxolotl.NAMESPACE);
             if (element == null) {
@@ -1102,7 +1121,9 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                     getOmemoStoreBackend().replenishKeys(userDevice);
                     OmemoBundleElement bundleElement = getOmemoStoreBackend().packOmemoBundle(userDevice);
                     publishBundle(manager.getConnection(), userDevice, bundleElement);
-                } catch (CorruptedOmemoKeyException | InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException | XMPPException.XMPPErrorException e) {
+                } catch (CorruptedOmemoKeyException | InterruptedException | SmackException.NoResponseException
+                                | SmackException.NotConnectedException | XMPPException.XMPPErrorException
+                                | NotALeafNodeException e) {
                     LOGGER.log(Level.WARNING, "Could not republish replenished bundle.", e);
                 }
             }
@@ -1110,10 +1131,10 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
     }
 
     @Override
-    public void onOmemoMessageStanzaReceived(Stanza stanza, OmemoManager.LoggedInOmemoManager managerGuard) {
+    public void onOmemoMessageStanzaReceived(Stanza stanza, OmemoManager.LoggedInOmemoManager managerGuard) throws IOException {
         OmemoManager manager = managerGuard.get();
         // Avoid the ratchet being manipulated and the bundle being published multiple times simultaneously
-        synchronized (manager.LOCK) {
+        synchronized (manager) {
             OmemoDevice userDevice = manager.getOwnDevice();
             OmemoElement element = stanza.getExtension(OmemoElement.NAME_ENCRYPTED, OmemoElement_VAxolotl.NAMESPACE);
             if (element == null) {
@@ -1183,7 +1204,9 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                     getOmemoStoreBackend().replenishKeys(userDevice);
                     OmemoBundleElement bundleElement = getOmemoStoreBackend().packOmemoBundle(userDevice);
                     publishBundle(manager.getConnection(), userDevice, bundleElement);
-                } catch (CorruptedOmemoKeyException | InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException | XMPPException.XMPPErrorException e) {
+                } catch (CorruptedOmemoKeyException | InterruptedException | SmackException.NoResponseException
+                                | SmackException.NotConnectedException | XMPPException.XMPPErrorException
+                                | NotALeafNodeException e) {
                     LOGGER.log(Level.WARNING, "Could not republish replenished bundle.", e);
                 }
             }
@@ -1197,11 +1220,12 @@ 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
      */
-    OmemoMessage.Received decryptStanza(Stanza stanza, OmemoManager.LoggedInOmemoManager managerGuard) {
+    OmemoMessage.Received decryptStanza(Stanza stanza, OmemoManager.LoggedInOmemoManager managerGuard) throws IOException {
         OmemoManager manager = managerGuard.get();
         // Avoid the ratchet being manipulated and the bundle being published multiple times simultaneously
-        synchronized (manager.LOCK) {
+        synchronized (manager) {
             OmemoDevice userDevice = manager.getOwnDevice();
             OmemoElement element = stanza.getExtension(OmemoElement.NAME_ENCRYPTED, OmemoElement_VAxolotl.NAMESPACE);
             if (element == null) {
@@ -1262,7 +1286,9 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                     getOmemoStoreBackend().replenishKeys(userDevice);
                     OmemoBundleElement bundleElement = getOmemoStoreBackend().packOmemoBundle(userDevice);
                     publishBundle(manager.getConnection(), userDevice, bundleElement);
-                } catch (CorruptedOmemoKeyException | InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException | XMPPException.XMPPErrorException e) {
+                } catch (CorruptedOmemoKeyException | InterruptedException | SmackException.NoResponseException
+                                | SmackException.NotConnectedException | XMPPException.XMPPErrorException
+                                | NotALeafNodeException e) {
                     LOGGER.log(Level.WARNING, "Could not republish replenished bundle.", e);
                 }
             }
@@ -1275,9 +1301,10 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      *
      * @param managerGuard authenticated OmemoManager.
      * @param brokenDevice device which session broke.
+     * @throws IOException
      */
     private void repairBrokenSessionWithPreKeyMessage(OmemoManager.LoggedInOmemoManager managerGuard,
-                                                      OmemoDevice brokenDevice) {
+                                                      OmemoDevice brokenDevice) throws IOException {
 
         LOGGER.log(Level.WARNING, "Attempt to repair the session by sending a fresh preKey message to "
                 + brokenDevice);
@@ -1307,11 +1334,12 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws SmackException.NotConnectedException
      * @throws CryptoFailedException if encryption fails (should not happen though, but who knows...)
      * @throws CannotEstablishOmemoSessionException if we cannot establish a session with contactsDevice.
+     * @throws IOException
      */
     private void sendRatchetUpdate(OmemoManager.LoggedInOmemoManager managerGuard, OmemoDevice contactsDevice)
             throws CorruptedOmemoKeyException, InterruptedException, SmackException.NoResponseException,
             NoSuchAlgorithmException, SmackException.NotConnectedException, CryptoFailedException,
-            CannotEstablishOmemoSessionException {
+            CannotEstablishOmemoSessionException, IOException {
 
         OmemoManager manager = managerGuard.get();
         OmemoElement ratchetUpdate = createRatchetUpdateElement(managerGuard, contactsDevice);
@@ -1350,10 +1378,12 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
      * @throws XMPPException.XMPPErrorException
      * @throws SmackException.NotConnectedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
+     * @throws NotALeafNodeException
      */
     public void purgeDeviceList(OmemoManager.LoggedInOmemoManager managerGuard)
             throws InterruptedException, XMPPException.XMPPErrorException, SmackException.NotConnectedException,
-            SmackException.NoResponseException {
+            SmackException.NoResponseException, IOException, NotALeafNodeException {
 
         OmemoManager omemoManager = managerGuard.get();
         OmemoDevice userDevice = omemoManager.getOwnDevice();

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java

@@ -18,6 +18,7 @@ package org.jivesoftware.smackx.omemo;
 
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.PRE_KEY_COUNT_PER_BUNDLE;
 
+import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -78,8 +79,9 @@ 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
      */
-    boolean isAvailableDeviceId(OmemoDevice userDevice, int id) {
+    boolean isAvailableDeviceId(OmemoDevice userDevice, int id) throws IOException {
         LOGGER.log(Level.INFO, "Check if id " + id + " is available...");
 
         // Lookup local cached device list
@@ -101,8 +103,9 @@ 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
      */
-    OmemoCachedDeviceList mergeCachedDeviceList(OmemoDevice userDevice, BareJid contact, OmemoDeviceListElement list) {
+    OmemoCachedDeviceList mergeCachedDeviceList(OmemoDevice userDevice, BareJid contact, OmemoDeviceListElement list) throws IOException {
         OmemoCachedDeviceList cached = loadCachedDeviceList(userDevice, contact);
 
         if (cached == null) {
@@ -131,10 +134,11 @@ 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
      * @throws IllegalStateException when our IdentityKeyPair is null.
      */
     void changeSignedPreKey(OmemoDevice userDevice)
-            throws CorruptedOmemoKeyException {
+            throws CorruptedOmemoKeyException, IOException {
 
         T_IdKeyPair idKeyPair = loadOmemoIdentityKeyPair(userDevice);
         if (idKeyPair == null) {
@@ -159,8 +163,9 @@ 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
      */
-    private void removeOldSignedPreKeys(OmemoDevice userDevice) {
+    private void removeOldSignedPreKeys(OmemoDevice userDevice) throws IOException {
         if (OmemoConfiguration.getMaxNumberOfStoredSignedPreKeys() <= 0) {
             return;
         }
@@ -181,9 +186,10 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
      * @param userDevice our OmemoDevice.
      * @return OmemoBundleElement
      * @throws CorruptedOmemoKeyException when a key could not be loaded
+     * @throws IOException
      */
     OmemoBundleElement_VAxolotl packOmemoBundle(OmemoDevice userDevice)
-            throws CorruptedOmemoKeyException {
+            throws CorruptedOmemoKeyException, IOException {
 
         int currentSignedPreKeyId = loadCurrentOmemoSignedPreKeyId(userDevice);
         T_SigPreKey currentSignedPreKey = loadOmemoSignedPreKeys(userDevice).get(currentSignedPreKeyId);
@@ -201,9 +207,10 @@ 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
      * @throws CorruptedOmemoKeyException
+     * @throws IOException
      */
     public void replenishKeys(OmemoDevice userDevice)
-            throws CorruptedOmemoKeyException {
+            throws CorruptedOmemoKeyException, IOException {
 
         T_IdKeyPair identityKeyPair = loadOmemoIdentityKeyPair(userDevice);
         if (identityKeyPair == null) {
@@ -244,9 +251,10 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
      * @param userDevice our OmemoDevice.
      * @return identityKeyPair
      * @throws CorruptedOmemoKeyException Thrown, if the stored key is damaged (*hands up* not my fault!)
+     * @throws IOException
      */
     public abstract T_IdKeyPair loadOmemoIdentityKeyPair(OmemoDevice userDevice)
-            throws CorruptedOmemoKeyException;
+            throws CorruptedOmemoKeyException, IOException;
 
     /**
      * Store our identityKeyPair in storage. It would be a cool feature, if the key could be stored in a encrypted
@@ -254,8 +262,9 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
      *
      * @param userDevice our OmemoDevice.
      * @param identityKeyPair identityKeyPair
+     * @throws IOException
      */
-    public abstract void storeOmemoIdentityKeyPair(OmemoDevice userDevice, T_IdKeyPair identityKeyPair);
+    public abstract void storeOmemoIdentityKeyPair(OmemoDevice userDevice, T_IdKeyPair identityKeyPair) throws IOException;
 
     /**
      * Remove the identityKeyPair of a user.
@@ -270,9 +279,10 @@ 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
      * @throws CorruptedOmemoKeyException when the key in question is corrupted and cant be deserialized.
+     * @throws IOException
      */
     public abstract T_IdKey loadOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice contactsDevice)
-            throws CorruptedOmemoKeyException;
+            throws CorruptedOmemoKeyException, IOException;
 
     /**
      * Store the public identityKey of the device.
@@ -280,8 +290,9 @@ 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
      */
-    public abstract void storeOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice contactsDevice, T_IdKey contactsKey);
+    public abstract void storeOmemoIdentityKey(OmemoDevice userDevice, OmemoDevice contactsDevice, T_IdKey contactsKey) throws IOException;
 
     /**
      * Removes the identityKey of a device.
@@ -298,8 +309,9 @@ 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
      */
-    public abstract void storeOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice, int counter);
+    public abstract void storeOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice, int counter) throws IOException;
 
     /**
      * Return the current value of the message counter.
@@ -309,8 +321,9 @@ 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
      */
-    public abstract int loadOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice);
+    public abstract int loadOmemoMessageCounter(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException;
 
     /**
      * Set the date of the last message that was received from a device.
@@ -318,8 +331,9 @@ 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
      */
-    public abstract void setDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date);
+    public abstract void setDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) throws IOException;
 
     /**
      * Return the date of the last message that was received from device 'from'.
@@ -327,8 +341,9 @@ 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
      */
-    public abstract Date getDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice);
+    public abstract Date getDateOfLastReceivedMessage(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException;
 
     /**
      * Set the date of the last time the deviceId was published. This method only gets called, when the deviceId
@@ -337,8 +352,9 @@ 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
      */
-    public abstract void setDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date);
+    public abstract void setDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice, Date date) throws IOException;
 
     /**
      * Return the date of the last time the deviceId was published after previously being not published.
@@ -347,24 +363,27 @@ 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
      */
-    public abstract Date getDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice);
+    public abstract Date getDateOfLastDeviceIdPublication(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException;
 
     /**
      * Set the date of the last time the signed preKey was renewed.
      *
      * @param userDevice our OmemoDevice.
      * @param date date
+     * @throws IOException
      */
-    public abstract void setDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice, Date date);
+    public abstract void setDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice, Date date) throws IOException;
 
     /**
      * Get the date of the last time the signed preKey was renewed.
      *
      * @param userDevice our OmemoDevice.
      * @return date if existent, otherwise null
+     * @throws IOException
      */
-    public abstract Date getDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice);
+    public abstract Date getDateOfLastSignedPreKeyRenewal(OmemoDevice userDevice) throws IOException;
 
     /**
      * Generate 'count' new PreKeys beginning with id 'startId'.
@@ -384,8 +403,9 @@ 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
      */
-    public abstract T_PreKey loadOmemoPreKey(OmemoDevice userDevice, int preKeyId);
+    public abstract T_PreKey loadOmemoPreKey(OmemoDevice userDevice, int preKeyId) throws IOException;
 
     /**
      * Store a PreKey in storage.
@@ -393,16 +413,18 @@ 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
      */
-    public abstract void storeOmemoPreKey(OmemoDevice userDevice, int preKeyId, T_PreKey preKey);
+    public abstract void storeOmemoPreKey(OmemoDevice userDevice, int preKeyId, T_PreKey preKey) throws IOException;
 
     /**
      * Store a whole bunch of preKeys.
      *
      * @param userDevice our OmemoDevice.
      * @param preKeyHashMap HashMap of preKeys
+     * @throws IOException
      */
-    public void storeOmemoPreKeys(OmemoDevice userDevice, TreeMap<Integer, T_PreKey> preKeyHashMap) {
+    public void storeOmemoPreKeys(OmemoDevice userDevice, TreeMap<Integer, T_PreKey> preKeyHashMap) throws IOException {
         for (Map.Entry<Integer, T_PreKey> entry : preKeyHashMap.entrySet()) {
             storeOmemoPreKey(userDevice, entry.getKey(), entry.getValue());
         }
@@ -422,8 +444,9 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
      *
      * @param userDevice our OmemoDevice.
      * @return Map containing our preKeys
+     * @throws IOException
      */
-    public abstract TreeMap<Integer, T_PreKey> loadOmemoPreKeys(OmemoDevice userDevice);
+    public abstract TreeMap<Integer, T_PreKey> loadOmemoPreKeys(OmemoDevice userDevice) throws IOException;
 
     /**
      * Return the signedPreKey with the id 'singedPreKeyId'.
@@ -431,10 +454,11 @@ 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
+     * @throws IOException
      */
-    public abstract T_SigPreKey loadOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId);
+    public abstract T_SigPreKey loadOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId) throws IOException;
 
-    public int loadCurrentOmemoSignedPreKeyId(OmemoDevice userDevice) {
+    public int loadCurrentOmemoSignedPreKeyId(OmemoDevice userDevice) throws IOException {
         return loadOmemoSignedPreKeys(userDevice).lastKey();
     }
 
@@ -443,8 +467,9 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
      *
      * @param userDevice our OmemoDevice.
      * @return HashMap of our singedPreKeys
+     * @throws IOException
      */
-    public abstract TreeMap<Integer, T_SigPreKey> loadOmemoSignedPreKeys(OmemoDevice userDevice);
+    public abstract TreeMap<Integer, T_SigPreKey> loadOmemoSignedPreKeys(OmemoDevice userDevice) throws IOException;
 
     /**
      * Generate a new signed preKey.
@@ -465,8 +490,9 @@ 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
      */
-    public abstract void storeOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId, T_SigPreKey signedPreKey);
+    public abstract void storeOmemoSignedPreKey(OmemoDevice userDevice, int signedPreKeyId, T_SigPreKey signedPreKey) throws IOException;
 
     /**
      * Remove a signedPreKey from storage.
@@ -482,8 +508,9 @@ 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
      */
-    public abstract T_Sess loadRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice);
+    public abstract T_Sess loadRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice) throws IOException;
 
     /**
      * Load all crypto-lib specific session objects of contact 'contact'.
@@ -491,8 +518,9 @@ 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
      */
-    public abstract HashMap<Integer, T_Sess> loadAllRawSessionsOf(OmemoDevice userDevice, BareJid contact);
+    public abstract HashMap<Integer, T_Sess> loadAllRawSessionsOf(OmemoDevice userDevice, BareJid contact) throws IOException;
 
     /**
      * Store a crypto-lib specific session to storage.
@@ -500,8 +528,9 @@ 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
      */
-    public abstract void storeRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice, T_Sess session);
+    public abstract void storeRawSession(OmemoDevice userDevice, OmemoDevice contactsDevice, T_Sess session) throws IOException;
 
     /**
      * Remove a crypto-lib specific session from storage.
@@ -535,15 +564,17 @@ 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
      */
-    public abstract OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice, BareJid contact);
+    public abstract OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice, BareJid contact) throws IOException;
 
     /**
      * Load a list of deviceIds from our own devices.
      * @param userDevice
      * @return
+     * @throws IOException
      */
-    public OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice) {
+    public OmemoCachedDeviceList loadCachedDeviceList(OmemoDevice userDevice) throws IOException {
         return loadCachedDeviceList(userDevice, userDevice.getJid());
     }
 
@@ -554,10 +585,11 @@ 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
      */
     public abstract void storeCachedDeviceList(OmemoDevice userDevice,
                                                BareJid contact,
-                                               OmemoCachedDeviceList contactsDeviceList);
+                                               OmemoCachedDeviceList contactsDeviceList) throws IOException;
 
     /**
      * Delete this device's IdentityKey, PreKeys, SignedPreKeys and Sessions.
@@ -580,9 +612,10 @@ 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
      */
     public OmemoFingerprint getFingerprint(OmemoDevice userDevice)
-            throws CorruptedOmemoKeyException {
+            throws CorruptedOmemoKeyException, IOException {
 
         T_IdKeyPair keyPair = loadOmemoIdentityKeyPair(userDevice);
         if (keyPair == null) {
@@ -600,9 +633,10 @@ 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
      */
     public OmemoFingerprint getFingerprint(OmemoDevice userDevice, OmemoDevice contactsDevice)
-            throws CorruptedOmemoKeyException, NoIdentityKeyException {
+            throws CorruptedOmemoKeyException, NoIdentityKeyException, IOException {
 
         T_IdKey identityKey = loadOmemoIdentityKey(userDevice, contactsDevice);
         if (identityKey == null) {
@@ -625,10 +659,11 @@ public abstract class OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
      * @throws SmackException.NotConnectedException
      * @throws InterruptedException
      * @throws SmackException.NoResponseException
+     * @throws IOException
      */
     public OmemoFingerprint getFingerprintAndMaybeBuildSession(OmemoManager.LoggedInOmemoManager managerGuard, OmemoDevice contactsDevice)
             throws CannotEstablishOmemoSessionException, CorruptedOmemoKeyException,
-            SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException {
+            SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException, IOException {
         OmemoManager omemoManager = managerGuard.get();
 
         // Load identityKey

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoBundleElement.java

@@ -60,8 +60,8 @@ public abstract class OmemoBundleElement implements ExtensionElement {
      * @param preKeysB64 HashMap of base64 encoded preKeys
      */
     public OmemoBundleElement(int signedPreKeyId, String signedPreKeyB64, String signedPreKeySigB64, String identityKeyB64, HashMap<Integer, String> preKeysB64) {
-        if (signedPreKeyId <= 0) {
+        if (signedPreKeyId < 0) {
-            throw new IllegalArgumentException("signedPreKeyId MUST be greater than 0.");
+            throw new IllegalArgumentException("signedPreKeyId MUST be greater than or equal to 0.");
         }
         this.signedPreKeyId = signedPreKeyId;
         this.signedPreKeyB64 = StringUtils.requireNotNullNorEmpty(signedPreKeyB64, "signedPreKeyB64 MUST NOT be null nor empty.");

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoCarbonCopyStanzaReceivedListener.java

@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.omemo.internal.listener;
 
+import java.io.IOException;
+
 import org.jivesoftware.smack.packet.Message;
 
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
@@ -26,5 +28,6 @@ import org.jivesoftware.smackx.omemo.OmemoManager;
  */
 public interface OmemoCarbonCopyStanzaReceivedListener {
 
-    void onOmemoCarbonCopyReceived(CarbonExtension.Direction direction, Message carbonCopy, Message wrappingMessage, OmemoManager.LoggedInOmemoManager omemoManager);
+    void onOmemoCarbonCopyReceived(CarbonExtension.Direction direction, Message carbonCopy, Message wrappingMessage,
+                    OmemoManager.LoggedInOmemoManager omemoManager) throws IOException;
 }

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoMessageStanzaReceivedListener.java

@@ -16,11 +16,13 @@
  */
 package org.jivesoftware.smackx.omemo.internal.listener;
 
+import java.io.IOException;
+
 import org.jivesoftware.smack.packet.Stanza;
 
 import org.jivesoftware.smackx.omemo.OmemoManager;
 
 public interface OmemoMessageStanzaReceivedListener {
 
-    void onOmemoMessageStanzaReceived(Stanza stanza, OmemoManager.LoggedInOmemoManager omemoManager);
+    void onOmemoMessageStanzaReceived(Stanza stanza, OmemoManager.LoggedInOmemoManager omemoManager) throws IOException;
 }

smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java

@@ -20,6 +20,7 @@ import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.CIPHERMOD
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.KEYLENGTH;
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.KEYTYPE;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
@@ -219,10 +220,11 @@ 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
      */
     public void addRecipient(OmemoDevice contactsDevice)
             throws NoIdentityKeyException, CorruptedOmemoKeyException, UndecidedOmemoIdentityException,
-            UntrustedOmemoIdentityException {
+            UntrustedOmemoIdentityException, IOException {
 
         OmemoFingerprint fingerprint;
         fingerprint = OmemoService.getInstance().getOmemoStoreBackend().getFingerprint(userDevice, contactsDevice);

smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoStoreTest.java

@@ -302,20 +302,20 @@ public abstract class OmemoStoreTest<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey
     }
 
     @Test
-    public void loadAllRawSessionsReturnsEmptyMapTest() {
+    public void loadAllRawSessionsReturnsEmptyMapTest() throws IOException {
         HashMap<Integer, T_Sess> sessions = store.loadAllRawSessionsOf(alice, bob.getJid());
         assertNotNull(sessions);
         assertEquals(0, sessions.size());
     }
 
     @Test
-    public void loadNonExistentRawSessionReturnsNullTest() {
+    public void loadNonExistentRawSessionReturnsNullTest() throws IOException {
         T_Sess session = store.loadRawSession(alice, bob);
         assertNull(session);
     }
 
     @Test
-    public void loadStoreMessageCounterTest() {
+    public void loadStoreMessageCounterTest() throws IOException {
         assertEquals(0, store.loadOmemoMessageCounter(alice, bob));
         store.storeOmemoMessageCounter(alice, bob, 20);
         assertEquals(20, store.loadOmemoMessageCounter(alice, bob));

smack-repl/build.gradle

@@ -19,6 +19,7 @@ dependencies {
 	compile project(':smack-experimental')
 	compile project(':smack-legacy')
 	compile project(':smack-integration-test')
+	compile project(':smack-omemo-signal')
     compile "org.scala-lang:scala-library:$scalaVersion"
     compile "com.lihaoyi:ammonite_$scalaVersion:1.3.2"
     testCompile project(path: ":smack-core", configuration: "testRuntime")

smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/DoX.java

@@ -2,17 +2,21 @@
  *
  * Copyright 2019 Florian Schmaus
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * This file is part of smack-repl.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This program is distributed in the hope that it will be useful,
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * See the License for the specific language governing permissions and
+ * GNU General Public License for more details.
- * limitations under the License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 package org.igniterealtime.smack.smackrepl;
 

smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/IoT.java

@@ -2,17 +2,21 @@
  *
  * Copyright 2016 Florian Schmaus
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * This file is part of smack-repl.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This program is distributed in the hope that it will be useful,
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * See the License for the specific language governing permissions and
+ * GNU General Public License for more details.
- * limitations under the License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 package org.igniterealtime.smack.smackrepl;
 

smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/Nio.java

@@ -2,17 +2,21 @@
  *
  * Copyright 2018 Florian Schmaus
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * This file is part of smack-repl.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This program is distributed in the hope that it will be useful,
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * See the License for the specific language governing permissions and
+ * GNU General Public License for more details.
- * limitations under the License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 package org.igniterealtime.smack.smackrepl;
 

smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/OmemoClient.java

@@ -0,0 +1,218 @@
+/**
+ *
+ * Copyright 2019 Paul Schaub
+ *
+ * This file is part of smack-repl.
+ *
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ */
+package org.igniterealtime.smack.smackrepl;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jivesoftware.smack.SmackConfiguration;
+import org.jivesoftware.smack.SmackException;
+import org.jivesoftware.smack.SmackException.NotConnectedException;
+import org.jivesoftware.smack.SmackException.NotLoggedInException;
+import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.tcp.XMPPTCPConnection;
+import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
+
+import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
+import org.jivesoftware.smackx.muc.MultiUserChat;
+import org.jivesoftware.smackx.omemo.OmemoManager;
+import org.jivesoftware.smackx.omemo.OmemoMessage;
+import org.jivesoftware.smackx.omemo.exceptions.CannotEstablishOmemoSessionException;
+import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
+import org.jivesoftware.smackx.omemo.exceptions.CryptoFailedException;
+import org.jivesoftware.smackx.omemo.exceptions.UndecidedOmemoIdentityException;
+import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
+import org.jivesoftware.smackx.omemo.listener.OmemoMessageListener;
+import org.jivesoftware.smackx.omemo.listener.OmemoMucMessageListener;
+import org.jivesoftware.smackx.omemo.signal.SignalCachingOmemoStore;
+import org.jivesoftware.smackx.omemo.signal.SignalFileBasedOmemoStore;
+import org.jivesoftware.smackx.omemo.signal.SignalOmemoService;
+import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint;
+import org.jivesoftware.smackx.omemo.trust.OmemoTrustCallback;
+import org.jivesoftware.smackx.omemo.trust.TrustState;
+import org.jivesoftware.smackx.pubsub.PubSubException;
+
+import org.jxmpp.jid.BareJid;
+import org.jxmpp.jid.EntityBareJid;
+import org.jxmpp.jid.impl.JidCreate;
+
+public class OmemoClient {
+
+    public static final Logger LOGGER = Logger.getLogger(OmemoClient.class.getName());
+
+    private static final Scanner scanner = new Scanner(System.in, "UTF-8");
+    private final XMPPTCPConnection connection;
+    private final OmemoManager omemoManager;
+
+    public static void main(String[] args)
+            throws XMPPException, SmackException, IOException, InterruptedException, CorruptedOmemoKeyException {
+        SmackConfiguration.DEBUG = true;
+        if (args.length != 2) {
+            print("Missing arguments: <jid> <password>");
+            return;
+        }
+        SignalOmemoService.acknowledgeLicense();
+        SignalOmemoService.setup();
+        SignalOmemoService omemoService = (SignalOmemoService) SignalOmemoService.getInstance();
+        Path omemoStoreDirectory = Files.createTempDirectory("omemo-store");
+        omemoService.setOmemoStoreBackend(new SignalCachingOmemoStore(new SignalFileBasedOmemoStore(omemoStoreDirectory.toFile())));
+
+        EntityBareJid jid = JidCreate.entityBareFromOrThrowUnchecked(args[0]);
+        String password = args[1];
+        OmemoClient client = new OmemoClient(jid, password);
+        try {
+            client.start();
+
+            while (true) {
+                String input = scanner.nextLine();
+                if (input.startsWith("/quit")) {
+                    break;
+                }
+                if (input.isEmpty()) {
+                    continue;
+                }
+                client.handleInput(input);
+            }
+        } finally {
+            client.stop();
+        }
+    }
+
+    public OmemoClient(EntityBareJid jid, String password) {
+        connection = new XMPPTCPConnection(XMPPTCPConnectionConfiguration.builder()
+                .setXmppAddressAndPassword(jid, password).build());
+        connection.setReplyTimeout(10 * 1000);
+        omemoManager = OmemoManager.getInstanceFor(connection);
+        omemoManager.setTrustCallback(new OmemoTrustCallback() {
+            // In a real app you'd want to persist these decisions
+            private final Map<OmemoFingerprint, TrustState> trustStateMap = new HashMap<>();
+            @Override
+            public TrustState getTrust(OmemoDevice device, OmemoFingerprint fingerprint) {
+                return trustStateMap.get(fingerprint) != null ? trustStateMap.get(fingerprint) : TrustState.undecided;
+            }
+
+            @Override
+            public void setTrust(OmemoDevice device, OmemoFingerprint fingerprint, TrustState state) {
+                trustStateMap.put(fingerprint, state);
+            }
+        });
+        omemoManager.addOmemoMessageListener(new OmemoMessageListener() {
+            @Override
+            public void onOmemoMessageReceived(Stanza s, OmemoMessage.Received m) {
+                print(m.getSenderDevice() + ": " + (m.getBody() != null ? m.getBody() : "<keyTransportMessage>"));
+            }
+
+            @Override
+            public void onOmemoCarbonCopyReceived(CarbonExtension.Direction d, Message cc, Message wm, OmemoMessage.Received m) {
+                onOmemoMessageReceived(cc, m);
+            }
+        });
+        omemoManager.addOmemoMucMessageListener(new OmemoMucMessageListener() {
+            @Override
+            public void onOmemoMucMessageReceived(MultiUserChat muc, Stanza s, OmemoMessage.Received m) {
+                print(s.getFrom() + ":" + m.getSenderDevice().getDeviceId() + ": " + (m.getBody() != null ? m.getBody() : "<keyTransportMessage>"));
+            }
+        });
+    }
+
+    public void start()
+            throws XMPPException, SmackException, IOException, InterruptedException, CorruptedOmemoKeyException {
+        connection.connect().login();
+        omemoManager.initialize();
+        print("Logged in!");
+    }
+
+    public void stop() {
+        connection.disconnect();
+    }
+
+    public void handleInput(String input)
+            throws NotConnectedException, NotLoggedInException, InterruptedException, IOException {
+        String[] com = input.split(" ", 3);
+        switch (com[0]) {
+            case "/omemo":
+                if (com.length < 3) {
+                    print("Usage: /omemo <contact-jid> <message>");
+                    return;
+                }
+
+                BareJid recipient = JidCreate.bareFrom(com[1]);
+                String body = com[2];
+
+                try {
+                    Message omemoMessage = omemoManager.encrypt(recipient, body).asMessage(recipient);
+                    connection.sendStanza(omemoMessage);
+                } catch (UndecidedOmemoIdentityException e) {
+                    print("Undecided Identities!\n" + Arrays.toString(e.getUndecidedDevices().toArray()));
+                } catch (CryptoFailedException | SmackException.NoResponseException e) {
+                    LOGGER.log(Level.SEVERE, "Unexpected Exception", e);
+                }
+                break;
+            case "/trust":
+                print("Trust");
+                if (com.length != 2) {
+                    print("Usage: /trust <contact-jid>");
+                }
+
+                BareJid contact = JidCreate.bareFrom(com[1]);
+
+                HashMap<OmemoDevice, OmemoFingerprint> devices;
+                try {
+                    devices = omemoManager.getActiveFingerprints(contact);
+                } catch (CorruptedOmemoKeyException | CannotEstablishOmemoSessionException | SmackException.NoResponseException e) {
+                    LOGGER.log(Level.SEVERE, "Unexpected Exception", e);
+                    return;
+                }
+                for (OmemoDevice d : devices.keySet()) {
+                    print("Trust (1) or distrust (2)?\n" + devices.get(d).blocksOf8Chars());
+                    if (Integer.parseInt(scanner.nextLine()) == 1) {
+                        omemoManager.trustOmemoIdentity(d, devices.get(d));
+                    } else {
+                        omemoManager.distrustOmemoIdentity(d, devices.get(d));
+                    }
+                }
+                print("Done.");
+                break;
+            case "/purge":
+                try {
+                    omemoManager.purgeDeviceList();
+                    print("Purged.");
+                } catch (XMPPException.XMPPErrorException | SmackException.NoResponseException | PubSubException.NotALeafNodeException e) {
+                    LOGGER.log(Level.SEVERE, "Unexpected Exception", e);
+                }
+        }
+    }
+
+    private static void print(String msg) {
+        // CHECKSTYLE:OFF
+        System.out.println(msg);
+        // CHECKSTYLE:ON
+    }
+}

smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/SmackRepl.java

@@ -2,17 +2,21 @@
  *
  * Copyright 2016 Florian Schmaus
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * This file is part of smack-repl.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This program is distributed in the hope that it will be useful,
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * See the License for the specific language governing permissions and
+ * GNU General Public License for more details.
- * limitations under the License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 package org.igniterealtime.smack.smackrepl;
 

smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/StateGraph.java

@@ -2,17 +2,21 @@
  *
  * Copyright 2018 Florian Schmaus
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * This file is part of smack-repl.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This program is distributed in the hope that it will be useful,
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * See the License for the specific language governing permissions and
+ * GNU General Public License for more details.
- * limitations under the License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 package org.igniterealtime.smack.smackrepl;
 

smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/TlsTest.java

@@ -2,17 +2,21 @@
  *
  * Copyright 2016 Florian Schmaus
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * This file is part of smack-repl.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This program is distributed in the hope that it will be useful,
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * See the License for the specific language governing permissions and
+ * GNU General Public License for more details.
- * limitations under the License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 package org.igniterealtime.smack.smackrepl;
 

smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/XmppTools.java

@@ -2,17 +2,21 @@
  *
  * Copyright 2016 Florian Schmaus
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * This file is part of smack-repl.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This program is distributed in the hope that it will be useful,
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * See the License for the specific language governing permissions and
+ * GNU General Public License for more details.
- * limitations under the License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 package org.igniterealtime.smack.smackrepl;
 

smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/package-info.java

@@ -2,17 +2,21 @@
  *
  * Copyright 2016 Florian Schmaus
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * This file is part of smack-repl.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This program is distributed in the hope that it will be useful,
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * See the License for the specific language governing permissions and
+ * GNU General Public License for more details.
- * limitations under the License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
 /**

smack-repl/src/test/java/org/igniterealtime/smack/smackrepl/SmackReplTest.java

@@ -2,17 +2,21 @@
  *
  * Copyright 2016 Florian Schmaus
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * This file is part of smack-repl.
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * smack-repl is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This program is distributed in the hope that it will be useful,
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * See the License for the specific language governing permissions and
+ * GNU General Public License for more details.
- * limitations under the License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 package org.igniterealtime.smack.smackrepl;