aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-24 18:18:24 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-24 18:18:24 +0200
commitd36ae091b6770948ca0581b2ec09e569fa61b8df (patch)
tree43222bd33f437a3d7e6ce87945949c77a0c6f8cf /src/main/java/eu/siacs/conversations
parentdeb9c20e5e7459c56f5207f3eaf9c189e383475a (diff)
parentd0b8bd0f8a0cb10c93d45d6900ff1fdb62db80b7 (diff)
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/IqParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java
index cef5b03d9..44e4bc089 100644
--- a/src/main/java/eu/siacs/conversations/parser/IqParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java
@@ -138,7 +138,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
}
try {
publicKey = Curve.decodePoint(Base64.decode(signedPreKeyPublic.getContent(),Base64.DEFAULT), 0);
- } catch (InvalidKeyException e) {
+ } catch (InvalidKeyException | IllegalArgumentException e) {
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX+" : "+"Invalid signedPreKeyPublic in PEP: " + e.getMessage());
}
return publicKey;