diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-07-28 22:58:37 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-07-29 22:22:09 +0200 |
| commit | 2d75d6804489337247f133a1b8542860af2066c8 (patch) | |
| tree | aced6cb56be7180b0e1af4fd2bfb9c72751d4318 /src/main/java/de/pixart/messenger/entities/Message.java | |
| parent | 5764829b086bfc83060783a1a146257e8d153c90 (diff) | |
show identity type for device selection
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Message.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Message.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java index 3145cdccf..e95781335 100644 --- a/src/main/java/de/pixart/messenger/entities/Message.java +++ b/src/main/java/de/pixart/messenger/entities/Message.java @@ -395,7 +395,7 @@ public class Message extends AbstractEntity { && this.counterpart.equals(message.getCounterpart()) && (body.equals(otherBody) ||(message.getEncryption() == Message.ENCRYPTION_PGP - && message.getRemoteMsgId().matches("[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"))) ; + && CryptoHelper.UUID_PATTERN.matcher(message.getRemoteMsgId()).matches())); } else { return this.remoteMsgId == null && this.counterpart.equals(message.getCounterpart()) @@ -549,7 +549,7 @@ public class Message extends AbstractEntity { try { counterpart = Jid.fromParts(conversation.getJid().getLocalpart(), conversation.getJid().getDomainpart(), - presences.asStringArray()[0]); + presences.toResourceArray()[0]); return true; } catch (InvalidJidException e) { counterpart = null; |