switched to cobratbq's OTR implementation

from here: https://github.com/cobratbq/otr4j/blob/master/MODIFICATIONS updated to new API structure
zom · May 23, 2018 · 0ff9d6b · 0ff9d6b
1 parent b3fac39
commit 0ff9d6b
Show file tree

Hide file tree

Showing 19 changed files with 200 additions and 410 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -133,7 +133,8 @@ dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
     //implementation project(':otr4jandroid')
 
-    implementation 'com.github.otr4j:otr4j:0.22'
+   // implementation 'com.github.otr4j:otr4j:0.22'
+    implementation 'com.github.cobratbq:otr4j:1ed70336c6'
 
     //  implementation 'com.github.otr4j:otr4j:aac20b11de'
     implementation project(':tibetanTextLibrary')

diff --git a/app/src/main/java/org/awesomeapp/messenger/ImApp.java b/app/src/main/java/org/awesomeapp/messenger/ImApp.java
@@ -260,11 +260,11 @@ public void onCreate() {
         mCacheWord.connectToService();
 
         if (sThreadPoolExecutor == null) {
-            int corePoolSize = 20;
-            int maximumPoolSize = 120;
-            int keepAliveTime = 30;
+            int corePoolSize = 10;
+            int maximumPoolSize = 20;
+            int keepAliveTime = 5;
             BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<Runnable>(maximumPoolSize);
-            sThreadPoolExecutor = new ThreadPoolExecutor(corePoolSize, maximumPoolSize, keepAliveTime, TimeUnit.SECONDS, workQueue);
+            sThreadPoolExecutor = new ThreadPoolExecutor(corePoolSize, maximumPoolSize, keepAliveTime, TimeUnit.MINUTES, workQueue);
         }
 
         IntentFilter intentFilter = new IntentFilter();

diff --git a/app/src/main/java/org/awesomeapp/messenger/crypto/otr/OtrAndroidKeyManagerImpl.java b/app/src/main/java/org/awesomeapp/messenger/crypto/otr/OtrAndroidKeyManagerImpl.java
@@ -35,12 +35,9 @@
 import java.util.Set;
 import java.util.Vector;
 
-import net.java.otr4j.OtrKeyManager;
-import net.java.otr4j.OtrKeyManagerListener;
-import net.java.otr4j.OtrKeyManagerStore;
-import net.java.otr4j.crypto.OtrCryptoEngineImpl;
+import net.java.otr4j.crypto.OtrCryptoEngine;
 import net.java.otr4j.crypto.OtrCryptoException;
-import net.java.otr4j.session.SessionID;
+import net.java.otr4j.api.SessionID;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -57,11 +54,10 @@
 
 import info.guardianproject.iocipher.*;
 
-public class OtrAndroidKeyManagerImpl extends IOtrKeyManager.Stub implements OtrKeyManager {
+public class OtrAndroidKeyManagerImpl extends IOtrKeyManager.Stub {
 
     private SimplePropertiesStore store;
 
-    private OtrCryptoEngineImpl cryptoEngine;
 
     private final static String KEY_ALG = "DSA";
     private final static int KEY_SIZE = 1024;
@@ -100,7 +96,7 @@ private OtrAndroidKeyManagerImpl(File filepath) throws IOException {
 
         store = new SimplePropertiesStore(filepath);
 
-        cryptoEngine = new OtrCryptoEngineImpl();
+
 
     }
 
@@ -167,7 +163,7 @@ private void upgradeStore() {
     }
     */
 
-    static class SimplePropertiesStore implements OtrKeyManagerStore {
+    static class SimplePropertiesStore  {
 
         private Properties mProperties = new Properties();
         private File mStoreFile;
@@ -374,20 +370,6 @@ public Set<Object> getKeySet ()
         }
     }
 
-    private List<OtrKeyManagerListener> listeners = new Vector<OtrKeyManagerListener>();
-
-    public void addListener(OtrKeyManagerListener l) {
-        synchronized (listeners) {
-            if (!listeners.contains(l))
-                listeners.add(l);
-        }
-    }
-
-    public void removeListener(OtrKeyManagerListener l) {
-        synchronized (listeners) {
-            listeners.remove(l);
-        }
-    }
 
     public void generateLocalKeyPair(SessionID sessionID) {
         if (sessionID == null)
@@ -407,7 +389,7 @@ public void regenerateLocalPublicKey(KeyFactory factory, String fullUserId, DSAP
         PublicKey pubKey;
         try {
             pubKey = factory.generatePublic(keySpec);
-            storeLocalPublicKey(userId, pubKey);
+            storePublicKey(userId, pubKey);
 
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -447,8 +429,7 @@ public void storeKeyPair (String userId, KeyPair keyPair)
         {
             // Store Public Key.
             PublicKey pubKey = keyPair.getPublic();
-            storeLocalPublicKey(userId, pubKey); //this will do saving
-
+            storePublicKey(userId, pubKey); //this will do saving
         }
         catch (Exception e)
         {
@@ -497,11 +478,11 @@ public void generateLocalKeyPair(String fullUserId) {
         }*/
     }
 
-    public void storeLocalPublicKey(String fullUserId, PublicKey pubKey) throws OtrCryptoException {
+    public void storePublicKey(String fullUserId, PublicKey pubKey) throws OtrCryptoException {
 
         String userId = Address.stripResource(fullUserId);
 
-        String fingerprintString = cryptoEngine.getFingerprint(pubKey);
+        String fingerprintString = OtrCryptoEngine.getFingerprint(pubKey);
         String fingerprintKey = userId + ".fingerprint";
 
         //check if we already have this
@@ -561,7 +542,6 @@ public String getLocalFingerprint(SessionID sessionID) {
         return getLocalFingerprint(sessionID.getAccountID());
     }
 
-    @Override
     public byte[] getLocalFingerprintRaw(SessionID sessionID) {
         String userId = Address.stripResource(sessionID.getAccountID());
 
@@ -571,7 +551,7 @@ public byte[] getLocalFingerprintRaw(SessionID sessionID) {
             return null;
 
         try {
-            return cryptoEngine.getFingerprintRaw(keyPair.getPublic());
+            return OtrCryptoEngine.getFingerprintRaw(keyPair.getPublic());
         }
         catch (Exception e)
         {
@@ -594,15 +574,12 @@ public String getLocalFingerprint(String fullUserId) {
 
     public String getFingerprint (PublicKey pubKey)
     {
-        try {
-            String fingerprint = cryptoEngine.getFingerprint(pubKey);
+
+            String fingerprint = OtrCryptoEngine.getFingerprint(pubKey);
             //  OtrDebugLogger.log("got fingerprint for: " + userId + "=" + fingerprint);
             return fingerprint;
 
-        } catch (OtrCryptoException e) {
-            e.printStackTrace();
-            return null;
-        }
+
     }
 
     public String getRemoteFingerprint(SessionID sessionID) {
@@ -651,11 +628,11 @@ public String getRemoteFingerprint(String fullUserId) {
 
         try {
             // Store the fingerprint, for posterity.
-            String fingerprintString = new OtrCryptoEngineImpl().getFingerprint(remotePublicKey);
+            String fingerprintString = OtrCryptoEngine.getFingerprint(remotePublicKey);
             this.store.setProperty(fullUserId + ".fingerprint", fingerprintString);
 
             return fingerprintString;
-        } catch (OtrCryptoException e) {
+        } catch (Exception e) {
             throw new RuntimeException("OtrCryptoException getting remote fingerprint",e);
 
         }
@@ -763,7 +740,7 @@ public KeyPair loadLocalKeyPair(SessionID sessionID) {
         if (sessionID == null)
             return null;
 
-        return loadLocalKeyPair(sessionID.getUserID());
+        return loadLocalKeyPair(sessionID.getAccountID());
     }
 
     private KeyPair loadLocalKeyPair(String fullUserId) {
@@ -835,8 +812,6 @@ private PublicKey loadRemotePublicKeyFromStore(String fullUserId) {
     }
 
     public void savePublicKey(SessionID sessionID, PublicKey pubKey) {
-        if (sessionID == null)
-            return;
 
         X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(pubKey.getEncoded());
 
@@ -849,7 +824,7 @@ public void savePublicKey(SessionID sessionID, PublicKey pubKey) {
         // Stash the associated fingerprint.  This saves calculating it in the future
         // and is useful for transferring rosters to other apps.
         try {
-            String fingerprintString = new OtrCryptoEngineImpl().getFingerprint(pubKey);
+            String fingerprintString = OtrCryptoEngine.getFingerprint(pubKey);
             String verifiedToken = buildPublicKeyVerifiedId(sessionID.getUserID(), fingerprintString);
             String fingerprintKey = fullUserId + ".fingerprint";
 
@@ -866,7 +841,7 @@ public void savePublicKey(SessionID sessionID, PublicKey pubKey) {
             }
 
 
-        } catch (OtrCryptoException e) {
+        } catch (Exception e) {
             Log.e(ImApp.LOG_TAG,"otr error: " + e.getMessage(),e);
         }
     }
@@ -880,9 +855,6 @@ public void unverify(SessionID sessionID) {
 
         unverifyUser(sessionID.getUserID());
 
-        for (OtrKeyManagerListener l : listeners)
-            l.verificationStatusChanged(sessionID);
-
     }
 
     public void unverifyUser(String fullUserId) {

diff --git a/app/src/main/java/org/awesomeapp/messenger/crypto/otr/OtrChatListener.java b/app/src/main/java/org/awesomeapp/messenger/crypto/otr/OtrChatListener.java
@@ -1,6 +1,11 @@
 package org.awesomeapp.messenger.crypto.otr;
 
 import android.text.TextUtils;
+import android.util.Log;
+
+import net.java.otr4j.api.SessionID;
+import net.java.otr4j.api.SessionStatus;
+import net.java.otr4j.api.TLV;
 
 import org.awesomeapp.messenger.model.ChatSession;
 import org.awesomeapp.messenger.model.ImErrorInfo;
@@ -11,10 +16,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.java.otr4j.OtrException;
-import net.java.otr4j.session.SessionID;
-import net.java.otr4j.session.SessionStatus;
-import net.java.otr4j.session.TLV;
 
 public class OtrChatListener implements MessageListener {
 
@@ -98,9 +99,9 @@ public boolean onIncomingMessage(ChatSession session, Message msg, boolean notif
                     }
                 }
 
-            } catch (OtrException oe) {
+            } catch (Exception oe) {
 
-                OtrDebugLogger.log("error decrypting message: " + msg.getID());
+                OtrDebugLogger.log("error decrypting message: " + msg.getID(),oe);
                 //  mOtrChatManager.refreshSession(sessionID.getLocalUserId(),sessionID.getRemoteUserId());
                 // msg.setBody("[" + "You received an unreadable encrypted message" + "]");
                 // mMessageListener.onIncomingMessage(session, msg);