Fixes some connection issues with msn, where provider goes in a state like its not connected (cannot send messages), but can receive such.

15 years ago · fbd33b96f8
parent 0c28648cf3
commit fbd33b96f8
6 changed files with 42 additions and 18 deletions
--- a/lib/installer-exclude/jml-1.0b5.jar
+++ b/lib/installer-exclude/jml-1.0b5.jar
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetAdHocMultiUserChatMsnImpl.java
@ -427,10 +427,16 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)
        {
            if (evt.getNewState() == RegistrationState.REGISTERED)
            {
-                provider.getMessenger().addSwitchboardListener(
-                    new MsnSwitchboardListener());
-                provider.getMessenger().addMessageListener(
-                    new MsnMessageListener());
+                if(provider.getMessenger() != null)
+                {
+                    provider.getMessenger().addSwitchboardListener(
+                        new MsnSwitchboardListener());
+                    provider.getMessenger().addMessageListener(
+                        new MsnMessageListener());
+                }
+                else if(logger.isInfoEnabled())
+                    logger.info("Registered but msnMessenger is missing!",
+                                new Exception());
            }
        }

--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
@ -193,12 +193,15 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)

                MsnMessenger msnMessenger = msnProvider.getMessenger();

-                /*
-                 * FIXME What's the point of having two MsnMessageListener
-                 * instances?
-                 */
-                msnMessenger.addMessageListener(new MsnMessageListener());
-                msnMessenger.addEmailListener(new MsnMessageListener());
+                if(msnMessenger != null)
+                {
+                    MsnMessageListener listener = new MsnMessageListener();
+                    msnMessenger.addMessageListener(listener);
+                    msnMessenger.addEmailListener(listener);
+                }
+                else if(logger.isInfoEnabled())
+                    logger.info("Registered but msnMessenger is missing!",
+                                new Exception());
            }
            else if(evt.getNewState() == RegistrationState.UNREGISTERED
                || evt.getNewState() == RegistrationState.CONNECTION_FAILED
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetFileTransferMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetFileTransferMsnImpl.java
@ -320,8 +320,14 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)

            if (evt.getNewState() == RegistrationState.REGISTERED)
            {
-                msnProvider.getMessenger().addFileTransferListener(
-                    new FileTransferProtocolListener());
+                if(msnProvider.getMessenger() != null)
+                {
+                    msnProvider.getMessenger().addFileTransferListener(
+                        new FileTransferProtocolListener());
+                }
+                else if(logger.isInfoEnabled())
+                    logger.info("Registered but msnMessenger is missing!",
+                                new Exception());
            }
        }
    }
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetPersistentPresenceMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetPersistentPresenceMsnImpl.java
@ -694,8 +694,14 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)

            if(evt.getNewState() == RegistrationState.REGISTERED)
            {
-                parentProvider.getMessenger().
-                    addContactListListener(new StatusChangedListener());
+                if(parentProvider.getMessenger() != null)
+                {
+                    parentProvider.getMessenger().
+                        addContactListListener(new StatusChangedListener());
+                }
+                else if(logger.isInfoEnabled())
+                    logger.info("Registered but msnMessenger is missing!",
+                                new Exception());
            }
            else if(evt.getNewState() == RegistrationState.UNREGISTERED
                 || evt.getNewState() == RegistrationState.AUTHENTICATION_FAILED
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetServerStoredAccountInfoMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetServerStoredAccountInfoMsnImpl.java
@ -561,11 +561,14 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)
                    in.read(b);
                    in.close();

-                    MsnOwner owner = msnProvider.getMessenger().getOwner();
+                    if(msnProvider.getMessenger() != null)
+                    {
+                        MsnOwner owner = msnProvider.getMessenger().getOwner();

-                    owner.setInitDisplayPicture(MsnObject.getInstance(
-                        owner.getEmail().getEmailAddress(),
-                        b));
+                        owner.setInitDisplayPicture(MsnObject.getInstance(
+                            owner.getEmail().getEmailAddress(),
+                            b));
+                    }
                }
            }
            catch(Exception ex)