From 0b9cce507de23a4e7f20d80572d77543ca2e9554 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 6 Sep 2018 18:49:12 +0200 Subject: [PATCH] Use asEntityBareJidOrThrow() in ChatMarkersManager listener --- .../smackx/chat_markers/ChatMarkersManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java index 32a2edaf0..2574f47eb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java @@ -1,6 +1,6 @@ /** * - * Copyright © 2016 Fernando Ramirez + * Copyright © 2016 Fernando Ramirez, 2018 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,7 +48,6 @@ import org.jivesoftware.smackx.chat_markers.filter.EligibleForChatMarker; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jxmpp.jid.EntityBareJid; -import org.jxmpp.jid.EntityFullJid; /** * Chat Markers Manager class (XEP-0333). @@ -138,8 +137,10 @@ public final class ChatMarkersManager extends Manager { SmackException.NotLoggedInException { final Message message = (Message) packet; - EntityFullJid fullFrom = message.getFrom().asEntityFullJidIfPossible(); - EntityBareJid bareFrom = fullFrom.asEntityBareJid(); + // Note that this listener is used together with a PossibleFromTypeFilter.ENTITY_BARE_JID filter, hence + // every message is guaranteed to have a from address which is representable as bare JID. + EntityBareJid bareFrom = message.getFrom().asEntityBareJidOrThrow(); + final Chat chat = chatManager.chatWith(bareFrom); asyncButOrdered.performAsyncButOrdered(chat, new Runnable() {