Set default sip registration time to 600.

Enable by default xcap server when adding existing sip2sip accounts.
Enable setting sip account avatar through xcap.

6 files changed, 45 insertions, 3 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetAvatarSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetAvatarSipImpl.java
new file mode 100644
index 0000000..fd19855
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetAvatarSipImpl.java
@@ -0,0 +1,27 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ * 
+ * Distributable under LGPL license. See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.protocol.sip;
+
+import net.java.sip.communicator.service.protocol.*;
+
+/**
+ * A simple implementation of the <tt>OperationSetAvatar</tt> interface for the
+ * jabber protocol.
+ * 
+ * @author Damian Minkov
+ */
+public class OperationSetAvatarSipImpl extends
+        AbstractOperationSetAvatar<ProtocolProviderServiceSipImpl>
+{
+
+    public OperationSetAvatarSipImpl(
+            ProtocolProviderServiceSipImpl parentProvider,
+            OperationSetServerStoredAccountInfo accountInfoOpSet)
+    {
+        super(parentProvider, accountInfoOpSet, 96, 96, 0);
+    }
+
+}
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java
index 02f5488..a956d60 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java
@@ -2443,7 +2443,9 @@ public class OperationSetPresenceSipImpl
                     String errorMessage = String.format(
                             "Error while getting icon %1s for the contact %2s",
                             imageUri, contact.getUri());
-                    logger.error(errorMessage, e);
+                    logger.warn(errorMessage);
+                    if(logger.isDebugEnabled())
+                        logger.debug(errorMessage, e);
                 }
             }
             else
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
index 05ba883..a6c2591 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
@@ -606,11 +606,16 @@ public class ProtocolProviderServiceSipImpl
                     new OperationSetTypingNotificationsSipImpl(
                             this,
                             opSetBasicIM));
+                OperationSetServerStoredAccountInfo opSetSSAccountInfo =
+                    new OperationSetServerStoredAccountInfoSipImpl(this);
                 // init avatar
                 addSupportedOperationSet(
                     OperationSetServerStoredAccountInfo.class,
-                    new OperationSetServerStoredAccountInfoSipImpl(this));
+                    opSetSSAccountInfo);
 
+                addSupportedOperationSet(
+                    OperationSetAvatar.class,
+                    new OperationSetAvatarSipImpl(this, opSetSSAccountInfo));
             }
 
             // OperationSetVideoTelephony
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
index 0fb4c0f..a5580b8 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
@@ -55,7 +55,7 @@ public class SipRegistrarConnection
     * expire or otherwise put - the number of seconds we wait before re-
     * registering.
     */
-    public static final int DEFAULT_REGISTRATION_EXPIRATION = 3600;
+    public static final int DEFAULT_REGISTRATION_EXPIRATION = 600;
 
     /**
     * The amount of time (in seconds) that registration take to expire or
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
index fa2c046..47d1581 100644
--- a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
@@ -54,6 +54,10 @@ public class Sip2SipAccountRegistrationWizard
         getRegistration().setKeepAliveMethod("NONE");

         getRegistration().setDefaultKeepAliveMethod("NONE");

         getRegistration().setDefaultDomain("sip2sip.info");

+        getRegistration().setXCapEnable(true);

+        getRegistration().setXCapServerUri(

+                "https://xcap.sipthor.net/xcap-root@sip2sip.info");

+        getRegistration().setXCapUseSipCredetials(true);

     }

 

     /**

diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
index 1959797..e561408 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
@@ -102,6 +102,10 @@ public class PresencePanel
             Resources.getString("plugin.sipaccregwizz.XCAP_USE_SIP_CREDENTIALS"),
             regform.getRegistration().isXCapUseSipCredetials());
 
+        if(regform.getRegistration().isXCapEnable())
+            this.xCapServerUriValue.setText(
+                    regform.getRegistration().getXCapServerUri());
+
         enablePresOpButton.addActionListener(new ActionListener()
         {
             public void actionPerformed(ActionEvent evt)