From 79efc958b095fcf62cad8ac0306db220ec99ac8b Mon Sep 17 00:00:00 2001
From: Timur Masar <tmasar@459below.org>
Date: Tue, 10 Nov 2015 02:55:41 +0100
Subject: [PATCH] Fixes offline messaging to contact which just went offline

We should still use the old implementation for checking offline contacts
capabilities. This will give us the 'offline capabilities' e.g.
messaging offline contacts.
---
 .../jabber/OperationSetContactCapabilitiesJabberImpl.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
index e74ace1a5..59cc17ca1 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
@@ -489,7 +489,8 @@ public void userCapsNodeChanged(String user, ArrayList<String> fullJids,
             if(JabberActivator.getConfigurationService()
                 .getBoolean(
                     PROP_XMPP_USE_ALL_RESOURCES_FOR_CAPABILITIES,
-                    USE_ALL_RESOURCES_FOR_CAPABILITIES_DEFAULT))
+                    USE_ALL_RESOURCES_FOR_CAPABILITIES_DEFAULT)
+                && !fullJids.isEmpty())
             {
                 String bareJid = StringUtils.parseBareAddress(user);
                 Contact contact = opsetPresence.findContactByID(bareJid);
@@ -570,7 +571,7 @@ public void fireContactCapabilitiesChanged(String user,
             .getBoolean(
                 PROP_XMPP_USE_ALL_RESOURCES_FOR_CAPABILITIES,
                 USE_ALL_RESOURCES_FOR_CAPABILITIES_DEFAULT)
-            ||fullJids.isEmpty())
+            || fullJids.isEmpty())
         {
             OperationSetPresence opsetPresence
             = parentProvider.getOperationSet(OperationSetPresence.class);