First draft of OMEMO

app/build.gradle

@@ -165,7 +165,7 @@ android {
 
 dependencies {
     api (project(':client-common-java')) {
-        exclude group: 'net.sf.kxml'
+        exclude group: 'xpp3', module: 'xpp3_min'
     }
 
     // support libraries
@@ -187,7 +187,12 @@ dependencies {
     // network/protocol libraries
     implementation "org.igniterealtime.smack:smack-tcp:$smackVersion"
     implementation "org.igniterealtime.smack:smack-experimental:$smackVersion"
-    implementation "org.igniterealtime.smack:smack-android:$smackVersion"
+    implementation ("org.igniterealtime.smack:smack-android:$smackVersion") {
+        exclude group: 'xpp3', module: 'xpp3_min'
+    }
+    implementation "org.igniterealtime.smack:smack-omemo:$smackVersion"
+    implementation "org.igniterealtime.smack:smack-omemo-signal:$smackVersion"
+    implementation 'org.whispersystems:signal-protocol-java:2.8.1'
     implementation 'info.guardianproject.netcipher:netcipher:1.2.1'
     implementation 'com.squareup.okhttp3:okhttp:4.5.0'
     implementation 'com.segment.backo:backo:1.0.0'

app/libs/README.md

@@ -0,0 +1,2 @@
+Temporary place for the libraries I couldn't automatically reference from Gradle.
+This folder will disappear before release.

app/proguard.cfg

@@ -50,7 +50,10 @@
 -keep class org.bouncycastle.openpgp.** { *; }
 
 # Smack Core classes should be figured out by Proguard
+# FIXME not really!
 -keep class org.jivesoftware.smack.initializer.** { *; }
+-keep class org.jivesoftware.smack.packet.** { *; }
+-keep class org.jivesoftware.smack.**.packet.** { *; }
 
 # keep Smack IM
 -keep class org.jivesoftware.smack.im.** { *; }
@@ -82,6 +85,9 @@
 -keep class org.jivesoftware.smackx.vcardtemp.** { *; }
 -keep class org.jivesoftware.smackx.xdata.** { *; }
 -keep class org.jivesoftware.smackx.forward.** { *; }
+-keep class org.jivesoftware.smackx.pubsub.** { *; }
+-keep class org.jivesoftware.smackx.pep.** { *; }
+-keep class org.jivesoftware.smackx.omemo.** { *; }
 
 # keep other Smack utilities
 -keep class org.jivesoftware.smack.**.java7.** { *; }
@@ -135,6 +141,9 @@
   public *;
 }
 
+# WhisperSystems (libsignal and curve*)
+-keep class org.whispersystems.** { *; }
+
 # OkHttp
 -dontwarn okio.**
 -dontwarn javax.annotation.Nullable

app/src/androidTest/java/org/kontalk/provider/UsersProviderTest.java

@@ -478,15 +478,15 @@ public void testSetup() {
 
     @Test
     public void testAutotrustedLevel() throws IOException, PGPException {
-        Keyring.setAutoTrustLevel(mContext, TEST_USERID, MyUsers.Keys.TRUST_VERIFIED);
+        Keyring.setAutoTrustLevel(mContext, TEST_USERID, Keyring.TRUST_VERIFIED);
         assertQueryValues(MyUsers.Keys.getUri(TEST_USERID, Keyring.VALUE_AUTOTRUST),
             MyUsers.Keys.JID, TEST_USERID,
             MyUsers.Keys.FINGERPRINT, Keyring.VALUE_AUTOTRUST);
 
         byte[] keydata = Base64.decode(TEST_KEYDATA, Base64.DEFAULT);
         PGPPublicKeyRing originalKey = PGP.readPublicKeyring(keydata);
         Keyring.setKey(mContext, TEST_USERID, keydata);
-        PGPPublicKeyRing publicKey = Keyring.getPublicKey(mContext, TEST_USERID, MyUsers.Keys.TRUST_VERIFIED);
+        PGPPublicKeyRing publicKey = Keyring.getPublicKey(mContext, TEST_USERID, Keyring.TRUST_VERIFIED);
         assertNotNull(publicKey);
         assertArrayEquals(publicKey.getEncoded(), originalKey.getEncoded());
 

app/src/main/java/org/kontalk/MessagesController.java

@@ -63,7 +63,6 @@
 import org.kontalk.provider.KontalkGroupCommands;
 import org.kontalk.provider.MessagesProviderClient;
 import org.kontalk.provider.MyMessages;
-import org.kontalk.provider.MyUsers;
 import org.kontalk.provider.UsersProvider;
 import org.kontalk.service.DownloadService;
 import org.kontalk.service.MediaService;
@@ -284,7 +283,7 @@ public boolean setTrustLevelAndRetryMessages(String jid, String fingerprint, int
             throw new NullPointerException("fingerprint");
 
         Keyring.setTrustLevel(mContext, jid, fingerprint, trustLevel);
-        if (trustLevel >= MyUsers.Keys.TRUST_IGNORED) {
+        if (trustLevel >= Keyring.TRUST_IGNORED) {
             retryMessagesTo(jid);
             return true;
         }

app/src/main/java/org/kontalk/authenticator/Authenticator.java

@@ -197,8 +197,11 @@ public static void exportDefaultPersonalKey(Context ctx, OutputStream dest, Stri
         // trusted keys
         Map<String, Keyring.TrustedFingerprint> trustedKeys = Keyring.getTrustedKeys(ctx);
 
+        String displayName = m.getUserData(acc, DATA_NAME);
+
         PersonalKeyExporter exp = new PersonalKeyExporter();
-        exp.save(privateKey, publicKey, dest, passphrase, exportPassphrase, bridgeCert, trustedKeys, acc.name);
+        exp.save(privateKey, publicKey, dest, passphrase, exportPassphrase,
+            bridgeCert, trustedKeys, acc.name, displayName);
     }
 
     public static byte[] getPrivateKeyExportData(Context ctx, String passphrase, String exportPassphrase)

app/src/main/java/org/kontalk/client/KontalkConnection.java

@@ -42,12 +42,15 @@
 import org.jivesoftware.smack.SASLAuthentication;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.StanzaListener;
+import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.StanzaFilter;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.sm.StreamManagementException;
 import org.jivesoftware.smack.sm.predicates.ForMatchingPredicateOrAfterXStanzas;
 import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
+import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
+import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 import org.jivesoftware.smackx.receipts.DeliveryReceipt;
 import org.jivesoftware.smackx.receipts.DeliveryReceiptRequest;
 import org.jxmpp.stringprep.XmppStringprepException;
@@ -66,6 +69,8 @@ public class KontalkConnection extends XMPPTCPConnection {
     /** Packet reply timeout. */
     public static final int DEFAULT_PACKET_TIMEOUT = 15000;
 
+    private DiscoverInfo mDiscoverInfoCache;
+
     protected EndpointServer mServer;
 
     /** Actually a copy of the same Smack map, but since we need access to the listeners... */
@@ -246,10 +251,41 @@ protected void processStanza(Stanza packet) throws InterruptedException {
         }
     }
 
+    @Override
+    protected void shutdown() {
+        purgeCaches();
+        super.shutdown();
+    }
+
+    @Override
+    public synchronized void instantShutdown() {
+        purgeCaches();
+        super.instantShutdown();
+    }
+
+    private synchronized void purgeCaches() {
+        mDiscoverInfoCache = null;
+    }
+
     public EndpointServer getServer() {
         return mServer;
     }
 
+    public synchronized DiscoverInfo getDiscoverInfo() throws XMPPException.XMPPErrorException,
+            SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException {
+        if (mDiscoverInfoCache == null) {
+            mDiscoverInfoCache = ServiceDiscoveryManager.getInstanceFor(this)
+                .discoverInfo(getXMPPServiceDomain());
+        }
+        return mDiscoverInfoCache;
+    }
+
+    public boolean supportsFeature(String feature) throws XMPPException.XMPPErrorException,
+            SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException {
+        DiscoverInfo cache = getDiscoverInfo();
+        return cache.containsFeature(feature);
+    }
+
     @Override
     public StanzaListener addStanzaIdAcknowledgedListener(String id, StanzaListener listener) throws StreamManagementException.StreamManagementNotEnabledException {
         AckMultiListener multi = mStanzaIdAcknowledgedListeners.get(id);

app/src/main/java/org/kontalk/client/SmackInitializer.java

@@ -18,6 +18,7 @@
 
 package org.kontalk.client;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -27,6 +28,9 @@
 import org.jivesoftware.smack.roster.Roster;
 import org.jivesoftware.smackx.iqregister.provider.RegistrationProvider;
 import org.jivesoftware.smackx.iqversion.VersionManager;
+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.xdata.provider.DataFormProvider;
 import org.minidns.dnsserverlookup.android21.AndroidUsingLinkProperties;
 
@@ -42,6 +46,8 @@
 public class SmackInitializer {
 
     private static boolean sInitialized;
+    // TODO not sure what to do with this for now
+    private static SignalOmemoService sOmemoService;
 
     public static void initialize(Context context) {
         if (!sInitialized) {
@@ -69,6 +75,22 @@ public static void initialize(Context context) {
             // we want to manually handle roster stuff
             Roster.setDefaultSubscriptionMode(Roster.SubscriptionMode.manual);
 
+            // initialize omemo engine
+            SignalOmemoService.acknowledgeLicense();
+            try {
+                SignalOmemoService.setup();
+                sOmemoService = (SignalOmemoService) SignalOmemoService.getInstance();
+                sOmemoService.setOmemoStoreBackend(
+                    new SignalCachingOmemoStore(
+                        new SignalFileBasedOmemoStore(new File(context.getFilesDir(), "omemo"))
+                    )
+                );
+            }
+            catch (Exception e) {
+                // this shouldn't happen, so we just crash for now
+                throw new RuntimeException("OMEMO engine failure", e);
+            }
+
             sInitialized = true;
         }
     }

app/src/main/java/org/kontalk/client/smack/SmackFuture.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2017-2018 Florian Schmaus
+ * Copyright 2017-2020 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
 import java.io.IOException;
 import java.net.Socket;
 import java.net.SocketAddress;
+import java.util.Collection;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -29,10 +31,10 @@
 
 import javax.net.SocketFactory;
 
-import org.jivesoftware.smack.AbstractXMPPConnection;
 import org.jivesoftware.smack.StanzaListener;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.util.CallbackRecipient;
+import org.jivesoftware.smack.util.Consumer;
 import org.jivesoftware.smack.util.ExceptionCallback;
 import org.jivesoftware.smack.util.SuccessCallback;
 
@@ -50,6 +52,8 @@ public abstract class SmackFuture<V, E extends Exception> implements Future<V>,
 
     private ExceptionCallback<E> exceptionCallback;
 
+    private Consumer<SmackFuture<V, E>> completionCallback;
+
     @Override
     public final synchronized boolean cancel(boolean mayInterruptIfRunning) {
         if (isDone()) {
@@ -89,16 +93,21 @@ public CallbackRecipient<V, E> onError(ExceptionCallback<E> exceptionCallback) {
         return this;
     }
 
+    public void onCompletion(Consumer<SmackFuture<V, E>> completionCallback) {
+        this.completionCallback = completionCallback;
+        maybeInvokeCallbacks();
+    }
+
     private V getOrThrowExecutionException() throws ExecutionException {
-        assert (result != null || exception != null || cancelled);
+        assert result != null || exception != null || cancelled;
         if (result != null) {
             return result;
         }
         if (exception != null) {
             throw new ExecutionException(exception);
         }
 
-        assert (cancelled);
+        assert cancelled;
         throw new CancellationException();
     }
 
@@ -150,11 +159,19 @@ public final synchronized V get(long timeout, TimeUnit unit)
         return getOrThrowExecutionException();
     }
 
+    public V getIfAvailable() {
+        return result;
+    }
+
     protected final synchronized void maybeInvokeCallbacks() {
         if (cancelled) {
             return;
         }
 
+        if ((result != null || exception != null) && completionCallback != null) {
+            completionCallback.accept(this);
+        }
+
         if (result != null && successCallback != null) {
             AbstractXMPPConnectionWrapper.asyncGo(new Runnable() {
                 @Override
@@ -294,7 +311,7 @@ public final synchronized void processStanza(Stanza stanza) {
      * A simple version of InternalSmackFuture which implements isNonFatalException(E) as always returning
      * <code>false</code> method.
      *
-     * @param <V>
+     * @param <V> the return value of the future.
      */
     public abstract static class SimpleInternalProcessStanzaSmackFuture<V, E extends Exception>
                     extends InternalProcessStanzaSmackFuture<V, E> {
@@ -310,4 +327,12 @@ public static <V, E extends Exception> SmackFuture<V, E> from(V result) {
         return future;
     }
 
+    public static boolean await(Collection<? extends SmackFuture<?, ?>> futures, long timeout, TimeUnit unit) throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(futures.size());
+        for (SmackFuture<?, ?> future : futures) {
+            future.onCompletion(f -> latch.countDown());
+        }
+
+        return latch.await(timeout, unit);
+    }
 }