Merge branch 'update_otr' of https://github.com/aelmahmoudy/xabber-android...

Merge branch 'update_otr' of https://github.com/aelmahmoudy/xabber-android into aelmahmoudy-update_otr

Conflicts:
	app/otr4j

otr4j @ 0ced8409

-Subproject commit 295de3b53f054625ecdcf0d5a5db4fc846144013
+Subproject commit 0ced840950b4db1a403ea085b642a7028b1ef03d

app/src/main/java/com/xabber/android/data/extension/otr/OTRManager.java

@@ -365,8 +365,7 @@ public class OTRManager implements OtrEngineHost, OtrEngineListener,
             PublicKey remotePublicKey = session.getRemotePublicKey();
             String value;
             try {
-                value = new OtrCryptoEngine()
-                        .getFingerprint(remotePublicKey);
+                value = OtrCryptoEngine.getFingerprint(remotePublicKey);
             } catch (OtrCryptoException e) {
                 LogManager.exception(this, e);
                 value = null;
@@ -542,7 +541,7 @@ public class OTRManager implements OtrEngineHost, OtrEngineListener,
 
     public String getLocalFingerprint(String account) {
         try {
-            return new OtrCryptoEngine().getFingerprint(getLocalKeyPair(
+            return OtrCryptoEngine.getFingerprint(getLocalKeyPair(
                     account).getPublic());
         } catch (OtrCryptoException e) {
             LogManager.exception(this, e);