Fixes bug with additional STUN servers and Jingle Nodes not being removed after Jabber account is edited

1 files changed, 45 insertions, 25 deletions

diff --git a/src/net/java/sip/communicator/service/protocol/AccountManager.java b/src/net/java/sip/communicator/service/protocol/AccountManager.java
index e6e76ee..02c044a 100644
--- a/src/net/java/sip/communicator/service/protocol/AccountManager.java
+++ b/src/net/java/sip/communicator/service/protocol/AccountManager.java
@@ -247,7 +247,7 @@ public class AccountManager
      * @param factory the factory which package will be returned.

      * @return the package name of the <tt>factory</tt>.

      */

-    private String getFactoryImplPackageName(ProtocolProviderFactory factory)

+    public String getFactoryImplPackageName(ProtocolProviderFactory factory)

     {

         String className = factory.getClass().getName();

 

@@ -660,30 +660,7 @@ public class AccountManager
             = ProtocolProviderActivator.getConfigurationService();

         String factoryPackage = getFactoryImplPackageName(factory);

 

-        // First check if such accountID already exists in the configuration.

-        List<String> storedAccounts =

-            configurationService.getPropertyNamesByPrefix(factoryPackage, true);

-        String accountUID = accountID.getAccountUniqueID();

-        String accountNodeName = null;

-

-        for (Iterator<String> storedAccountIter = storedAccounts.iterator();

-             storedAccountIter.hasNext();)

-        {

-            String storedAccount = storedAccountIter.next();

-

-            // If the property is not related to an account we skip it.

-            int dotIndex = storedAccount.lastIndexOf(".");

-            if (!storedAccount.substring(dotIndex + 1)

-                    .startsWith(ACCOUNT_UID_PREFIX))

-                continue;

-

-            String storedAccountUID =

-                configurationService.getString(storedAccount + "."

-                    + ProtocolProviderFactory.ACCOUNT_UID);

-

-            if (storedAccountUID.equals(accountUID))

-                accountNodeName = configurationService.getString(storedAccount);

-        }

+       String accountNodeName = getAccountNodeName(factory, accountID);

 

         Map<String, Object> configurationProperties

             = new HashMap<String, Object>();

@@ -783,6 +760,49 @@ public class AccountManager
     }

 

     /**

+     * Gets account node name under which account configuration properties are

+     * stored.

+     *

+     * @param factory account's protocol provider factory

+     * @param accountID account for which the prefix will be returned

+     * @return configuration prefix for given <tt>accountID</tt> if exists or

+     *         <tt>null</tt> otherwise

+     */

+    public String getAccountNodeName( ProtocolProviderFactory factory,

+                                      AccountID accountID )

+    {

+        ConfigurationService configurationService

+                = ProtocolProviderActivator.getConfigurationService();

+        String factoryPackage = getFactoryImplPackageName(factory);

+

+        // First check if such accountID already exists in the configuration.

+        List<String> storedAccounts =

+            configurationService.getPropertyNamesByPrefix(factoryPackage, true);

+        String accountUID = accountID.getAccountUniqueID();

+        String accountNodeName = null;

+

+        for (Iterator<String> storedAccountIter = storedAccounts.iterator();

+             storedAccountIter.hasNext();)

+        {

+            String storedAccount = storedAccountIter.next();

+

+            // If the property is not related to an account we skip it.

+            int dotIndex = storedAccount.lastIndexOf(".");

+            if (!storedAccount.substring(dotIndex + 1)

+                    .startsWith(ACCOUNT_UID_PREFIX))

+                continue;

+

+            String storedAccountUID

+                = configurationService.getString(

+                    storedAccount + "." + ProtocolProviderFactory.ACCOUNT_UID);

+

+            if (storedAccountUID.equals(accountUID))

+                accountNodeName = configurationService.getString(storedAccount);

+        }

+        return accountNodeName;

+    }

+

+    /**

      * Removes the account with <tt>accountID</tt> from the set of accounts

      * that are persistently stored inside the configuration service.

      *