Changes xmpp priority to be dependent on the presence status. Default values can be overridden with account properties.

src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java

@@ -52,7 +52,7 @@ public class OperationSetPersistentPresenceJabberImpl
     private PresenceStatus currentStatus;
 
     /**
-     * A map containing bindings between SIP Communicator's jabber presence
+     * A map containing bindings between Jitsi's jabber presence
      * status instances and Jabber status codes
      */
     private static Map<String, Presence.Mode> scToJabberModesMappings
@@ -74,6 +74,13 @@ public class OperationSetPersistentPresenceJabberImpl
                                   Presence.Mode.available);
     }
 
+    /**
+     * A map containing bindings between Jitsi's xmpp presence
+     * status instances and priorities to use for statuses.
+     */
+    private static Map<String, Integer> statusToPriorityMappings
+        = new Hashtable<String, Integer>();
+
     /**
      * The server stored contact list that will be encapsulating smack's
      * buddy list.
@@ -86,9 +93,9 @@ public class OperationSetPersistentPresenceJabberImpl
     private JabberSubscriptionListener subscribtionPacketListener = null;
 
     /**
-     * Current resource priority. 10 is default value.
+     * Current resource priority.
      */
-    private int resourcePriority = 10;
+    private int resourcePriorityAvailable = 30;
 
     /**
      * Manages statuses and different user resources.
@@ -117,6 +124,8 @@ public OperationSetPersistentPresenceJabberImpl(
             parentProvider.getJabberStatusEnum().getStatus(
                 JabberStatusEnum.OFFLINE);
 
+        initializePriorities();
+
         ssContactList = new ServerStoredContactListJabberImpl(
             this , provider, infoRetreiver);
 
@@ -391,7 +400,8 @@ public void publishPresenceStatus(PresenceStatus status,
         {
             Presence presence = new Presence(Presence.Type.available);
             presence.setMode(presenceStatusToJabberMode(status));
-            presence.setPriority(resourcePriority);
+            presence.setPriority(
+                getPriorityForPresenceStatus(status.getStatusName()));
 
             // on the phone is a special status which is away
             // with custom status message
@@ -1268,26 +1278,6 @@ else if (presenceType == Presence.Type.subscribed)
         }
     }
 
-    /**
-     * Returns the jabber account resource priority property value.
-     *
-     * @return the jabber account resource priority property value
-     */
-    public int getResourcePriority()
-    {
-        return resourcePriority;
-    }
-
-    /**
-     * Updates the jabber account resource priority property value.
-     *
-     * @param resourcePriority the new priority to set
-     */
-    public void setResourcePriority(int resourcePriority)
-    {
-        this.resourcePriority = resourcePriority;
-    }
-
     /**
      * Runnable that resolves our list against the server side roster.
      * This thread is the one which will call getRoaster for the first time.
@@ -1504,4 +1494,116 @@ public void parseContactPhotoPresence(Packet packet)
             }
         }
     }
+
+    /**
+     * Initializes the map with priorities and statuses which we will use when
+     * changing statuses.
+     */
+    private void initializePriorities()
+    {
+        try
+        {
+            this.resourcePriorityAvailable =
+                Integer.parseInt(parentProvider.getAccountID()
+                    .getAccountPropertyString(
+                        ProtocolProviderFactory.RESOURCE_PRIORITY));
+        }
+        catch(NumberFormatException ex)
+        {
+            logger.error("Wrong value for resource priority", ex);
+        }
+
+        addDefaultValue(JabberStatusEnum.AWAY, -5);
+        addDefaultValue(JabberStatusEnum.EXTENDED_AWAY, -10);
+        addDefaultValue(JabberStatusEnum.ON_THE_PHONE, -15);
+        addDefaultValue(JabberStatusEnum.DO_NOT_DISTURB, -20);
+        addDefaultValue(JabberStatusEnum.FREE_FOR_CHAT, +5);
+    }
+
+    /**
+     * Checks for account property that can override this status.
+     * If missing use the shift value to create the priority to use, make sure
+     * it is not zero or less than it.
+     * @param statusName the status to check/create priority
+     * @param availableShift the difference from available resource
+     *                       value to use.
+     */
+    private void addDefaultValue(String statusName, int availableShift)
+    {
+        String resourcePriority = getAccountPriorityForStatus(statusName);
+        if(resourcePriority != null)
+        {
+            try
+            {
+                addPresenceToPriorityMapping(
+                    statusName,
+                    Integer.parseInt(resourcePriority));
+            }
+            catch(NumberFormatException ex)
+            {
+                logger.error(
+                    "Wrong value for resource priority for status: "
+                        + statusName, ex);
+            }
+        }
+        else
+        {
+            // if priority is less than zero, use the available priority
+            int priority = resourcePriorityAvailable + availableShift;
+            if(priority <= 0)
+                priority = resourcePriorityAvailable;
+
+            addPresenceToPriorityMapping(statusName, priority);
+        }
+    }
+
+    /**
+     * Adds the priority mapping for the <tt>statusName</tt>.
+     * Make sure we replace ' ' with '_' and use upper case as this will be
+     * and the property names used in account properties that can override
+     * this values.
+     * @param statusName the status name to use
+     * @param value and its priority
+     */
+    private static void addPresenceToPriorityMapping(String statusName,
+                                                     int value)
+    {
+        statusToPriorityMappings.put(
+            statusName.replaceAll(" ", "_").toUpperCase(), value);
+    }
+
+    /**
+     * Returns the priority which will be used for <tt>statusName</tt>.
+     * Make sure we replace ' ' with '_' and use upper case as this will be
+     * and the property names used in account properties that can override
+     * this values.
+     * @param statusName the status name
+     * @return the priority which will be used for <tt>statusName</tt>.
+     */
+    private int getPriorityForPresenceStatus(String statusName)
+    {
+        Integer priority = statusToPriorityMappings.get(
+                                statusName.replaceAll(" ", "_").toUpperCase());
+        if(priority == null)
+            return resourcePriorityAvailable;
+
+        return priority;
+    }
+
+    /**
+     * Returns the account property value for a status name, if missing return
+     * null.
+     * Make sure we replace ' ' with '_' and use upper case as this will be
+     * and the property names used in account properties that can override
+     * this values.
+     * @param statusName
+     * @return the account property value for a status name, if missing return
+     * null.
+     */
+    private String getAccountPriorityForStatus(String statusName)
+    {
+        return parentProvider.getAccountID().getAccountPropertyString(
+                    ProtocolProviderFactory.RESOURCE_PRIORITY + "_" +
+                        statusName.replaceAll(" ", "_").toUpperCase());
+    }
 }

src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java

@@ -1515,9 +1515,6 @@ protected void initialize(String screenname,
             String keepAliveStrValue
                 = accountID.getAccountPropertyString(
                     ProtocolProviderFactory.KEEP_ALIVE_METHOD);
-            String resourcePriority
-                = accountID.getAccountPropertyString(
-                        ProtocolProviderFactory.RESOURCE_PRIORITY);
 
             InfoRetreiver infoRetreiver = new InfoRetreiver(this, screenname);
 
@@ -1525,18 +1522,6 @@ protected void initialize(String screenname,
             OperationSetPersistentPresenceJabberImpl persistentPresence =
                 new OperationSetPersistentPresenceJabberImpl(this, infoRetreiver);
 
-            if(resourcePriority != null)
-            {
-                persistentPresence
-                    .setResourcePriority(Integer.parseInt(resourcePriority));
-                // TODO : is this resource priority related to xep-0168
-                // (Resource Application Priority) ?
-                // see http://www.xmpp.org/extensions/xep-0168.html
-                // If the answer is no, comment the following lines please
-                supportedFeatures.add(
-                        "http://www.xmpp.org/extensions/xep-0168.html#ns");
-            }
-
             addSupportedOperationSet(
                 OperationSetPersistentPresence.class,
                 persistentPresence);