diff options
| author | Christian S <christian@pix-art.de> | 2015-09-12 10:27:56 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-09-12 10:27:56 +0200 |
| commit | 58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (patch) | |
| tree | 657fba8eebcc988c833a317834cdb30dddfd4b02 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | c90ca66c58c37836c13075c794b1e7cad3813984 (diff) | |
| parent | 07c1571e1eb32c1c36fe80bdb96caf17c3824dc4 (diff) | |
Merge branch 'siacs-master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 08d40fcba..1168e0403 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -754,7 +754,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } break; case Message.ENCRYPTION_AXOLOTL: - message.setAxolotlFingerprint(account.getAxolotlService().getOwnPublicKey().getFingerprint().replaceAll("\\s", "")); + message.setAxolotlFingerprint(account.getAxolotlService().getOwnFingerprint()); if (message.needsUploading()) { if (account.httpUploadAvailable() || message.fixCounterpart()) { this.sendFileMessage(message,delay); @@ -799,7 +799,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } break; case Message.ENCRYPTION_AXOLOTL: - message.setAxolotlFingerprint(account.getAxolotlService().getOwnPublicKey().getFingerprint().replaceAll("\\s", "")); + message.setAxolotlFingerprint(account.getAxolotlService().getOwnFingerprint()); break; } } |