Merge branch 'aelmahmoudy-update_otr' into develop

03de420a · Grigory Fedorov · 619bda43 · 9a6be6fa · 0ced8409 · 03de420a
Commit 03de420a authored Apr 22, 2015 by Grigory Fedorov
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

otr4j app/otr4j +1 -1

OTRManager.java ...ava/com/xabber/android/data/extension/otr/OTRManager.java +2 -3

No files found.
--- a/otr4j @ 0ced8409
+++ b/otr4j @ 0ced8409
-Subproject commit 295de3b53f054625ecdcf0d5a5db4fc846144013
+Subproject commit 0ced840950b4db1a403ea085b642a7028b1ef03d
--- a/app/src/main/java/com/xabber/android/data/extension/otr/OTRManager.java
+++ b/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()
+                value = OtrCryptoEngine.getFingerprint(remotePublicKey);
-                        .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);