aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/crypto
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-14 21:36:38 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-14 21:36:38 +0100
commit4e4a767743a62d1f88814e5cf024bf983772df2c (patch)
treef31d328a9df9f45d5838849631ea97f82f1c4490 /src/eu/siacs/conversations/crypto
parentbae741875690400efac68ed49f2ead405ec2ed53 (diff)
added display of own fingerprint
Diffstat (limited to 'src/eu/siacs/conversations/crypto')
-rw-r--r--src/eu/siacs/conversations/crypto/OtrEngine.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/crypto/OtrEngine.java b/src/eu/siacs/conversations/crypto/OtrEngine.java
index ca6230e1b..32cd26b6c 100644
--- a/src/eu/siacs/conversations/crypto/OtrEngine.java
+++ b/src/eu/siacs/conversations/crypto/OtrEngine.java
@@ -119,6 +119,9 @@ public class OtrEngine implements OtrEngineHost {
}
public PublicKey getPublicKey() {
+ if (this.keyPair == null) {
+ return null;
+ }
return this.keyPair.getPublic();
}