Changes the implementation of the calendar service to ignore the offline protocol

providers. Fixes an issue with the callback for updated calendar items.

src/net/java/sip/communicator/plugin/addrbook/AddrBookActivator.java

@@ -105,8 +105,7 @@ public class AddrBookActivator
     /**
      * List of the providers with registration listener.
      */
-    private static List<ProtocolProviderService> providers
-        = new ArrayList<ProtocolProviderService>();
+    private static List<ProtocolProviderService> providers;
 
     /**
      * The registered PhoneNumberI18nService.
@@ -155,7 +154,8 @@ public void serviceChanged(ServiceEvent ev)
                     {
                         providers.add(pps);
                     }
-                    pps.addRegistrationStateChangeListener(providerListener);
+                    if(!pps.isRegistered())
+                        pps.addRegistrationStateChangeListener(providerListener);
                     break;
 
                 case ServiceEvent.UNREGISTERING:
@@ -420,11 +420,8 @@ static void startCalendarService()
             bundleContext.addServiceListener(serviceListener);
             for(ProtocolProviderService pps : getProtocolProviders())
             {
-                synchronized(providers)
-                {
-                    providers.add(pps);
-                }
-                pps.addRegistrationStateChangeListener(providerListener);
+                if(!pps.isRegistered())
+                    pps.addRegistrationStateChangeListener(providerListener);
             }
             bundleContext.registerService(CalendarService.class.getName(),
                 calendarService, null);
@@ -445,7 +442,7 @@ static void stopCalendarService()
             bundleContext.removeServiceListener(serviceListener);
             synchronized(providers)
             {
-                for(ProtocolProviderService pps : providers)
+                for(ProtocolProviderService pps : getProtocolProviders())
                    pps.removeRegistrationStateChangeListener(providerListener);
             }
             calendarService = null;
@@ -505,34 +502,44 @@ public static void unsetDefaultIMApplication()
 
     public static List<ProtocolProviderService> getProtocolProviders()
     {
-        ServiceReference[] ppsRefs;
-        List<ProtocolProviderService> result
-            = new ArrayList<ProtocolProviderService>();
-
-        try
+        List<ProtocolProviderService> result;
+        
+        if(providers == null)
         {
-            ppsRefs
-                = bundleContext.getServiceReferences(
-                        ProtocolProviderService.class.getName(),
-                        null);
-        }
-        catch (InvalidSyntaxException ise)
-        {
-            ppsRefs = null;
-        }
-        if ((ppsRefs != null) && (ppsRefs.length != 0))
-        {
-            for (ServiceReference ppsRef : ppsRefs)
+            providers = new ArrayList<ProtocolProviderService>();
+            synchronized(providers)
             {
-                ProtocolProviderService pps
-                    = (ProtocolProviderService)
-                        bundleContext.getService(ppsRef);
-
-                result.add(pps);
+                ServiceReference[] ppsRefs;
+                try
+                {
+                    ppsRefs
+                        = bundleContext.getServiceReferences(
+                                ProtocolProviderService.class.getName(),
+                                null);
+                }
+                catch (InvalidSyntaxException ise)
+                {
+                    ppsRefs = null;
+                }
+                if ((ppsRefs != null) && (ppsRefs.length != 0))
+                {
+                    for (ServiceReference ppsRef : ppsRefs)
+                    {
+                        ProtocolProviderService pps
+                            = (ProtocolProviderService)
+                                bundleContext.getService(ppsRef);
+                        providers.add(pps);
+                    }
+                }
             }
         }
+        
+        synchronized(providers)
+        {
+            result = new ArrayList<ProtocolProviderService>(providers);
+        }
+        
         return result;
-
     }
 
     /**

src/net/java/sip/communicator/plugin/addrbook/msoutlook/calendar/CalendarServiceImpl.java

@@ -6,6 +6,7 @@
  */
 package net.java.sip.communicator.plugin.addrbook.msoutlook.calendar;
 
+import java.beans.*;
 import java.text.*;
 import java.util.*;
 import java.util.regex.*;
@@ -15,6 +16,7 @@
 import net.java.sip.communicator.plugin.addrbook.msoutlook.*;
 import net.java.sip.communicator.service.calendar.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
 /**
@@ -244,6 +246,27 @@ public static MAPICalendarProperties getByOrderId(int i)
      */
     private InMeetingStatusPolicy inMeetingStatusPolicy
         = new InMeetingStatusPolicy();
+    
+    public ProviderPresenceStatusListener presenceStatusListener 
+        = new ProviderPresenceStatusListener()
+        {
+            
+            @Override
+            public void providerStatusMessageChanged(PropertyChangeEvent evt)
+            {
+                
+            }
+            
+            @Override
+            public void providerStatusChanged(ProviderPresenceStatusChangeEvent evt)
+            {
+                if(evt.getNewStatus().isOnline())
+                {
+                    inMeetingStatusPolicy.handleProtocolProvider(
+                        evt.getProvider(), null, false, true);
+                }
+            }
+        };
 
     /**
      * The flag which signals that MAPI strings should be returned in the
@@ -759,20 +782,22 @@ private void run(boolean onThePhoneStatusChanged)
                     if (pps == null)
                         continue;
 
-                    handleProtocolProvider(pps, isInMeeting, onThePhoneStatusChanged);
+                    handleProtocolProvider(pps, isInMeeting, 
+                        onThePhoneStatusChanged, false);
                 }
             }
         }
 
         public void handleProtocolProvider(ProtocolProviderService pps,
-            Boolean isInMeeting, boolean onThePhoneStatusChanged)
+            Boolean isInMeeting, boolean onThePhoneStatusChanged, 
+            boolean dontAddListeners)
         {
+            
             if(isInMeeting == null)
                 isInMeeting = isInMeeting();
 
             OperationSetPresence presence
                 = pps.getOperationSet(OperationSetPresence.class);
-
             if (presence == null)
             {
                 /*
@@ -801,23 +826,40 @@ else if (pps.isRegistered())
                 }
                 else if (isInMeeting)
                 {
+                    if(!dontAddListeners)
+                    {
+                        presence.addProviderPresenceStatusListener(
+                            presenceStatusListener);
+                    }
                     PresenceStatus presenceStatus
                         = presence.getPresenceStatus();
 
                     if (presenceStatus == null)
                     {
+                        logger.info("HANDLE provider 55");
                         /*
                          * It is strange that an OperationSetPresence
                          * does not have a PresenceStatus so it may be
                          * safer to not mess with it.
                          */
                         forgetPresenceStatus(pps);
+                        presence.removeProviderPresenceStatusListener(
+                            presenceStatusListener);
                     }
                     else if (!inMeetingPresenceStatus.equals(
                             presenceStatus)
                             && (!presenceStatus.equals(onThePhone)
                                 || onThePhoneStatusChanged))
                     {
+                        if(!dontAddListeners)
+                        {
+                            if(!presenceStatus.isOnline())
+                            {
+                                return;
+                            }
+                            presence.removeProviderPresenceStatusListener(
+                                presenceStatusListener);
+                        }
                         publishPresenceStatus(
                                 presence,
                                 inMeetingPresenceStatus);
@@ -831,6 +873,11 @@ else if (!inMeetingPresenceStatus.equals(
                             forgetPresenceStatus(pps);
                         }
                     }
+                    else
+                    {
+                        presence.removeProviderPresenceStatusListener(
+                            presenceStatusListener);
+                    }
                 }
                 else
                 {
@@ -847,10 +894,6 @@ else if (!inMeetingPresenceStatus.equals(
             }
             else
             {
-                /*
-                 * Offline accounts do not get their PresenceStatus
-                 * modified for the purposes of "On the phone".
-                 */
                 forgetPresenceStatus(pps);
             }
 
@@ -887,14 +930,11 @@ public void updated(String id)
                 synchronized(taskMap)
                 {
                     CalendarItemTimerTask task = taskMap.get(id);
+                    //Expired tasks can be removed earlier from the taskMap.
                     if(task != null)
                     {
                         task.remove();
                     }
-                    else
-                    {
-                        return;
-                    }
                 }
                 insert(id);
             }
@@ -938,7 +978,7 @@ public boolean callback(String id)
 
     public void handleProviderAdded(ProtocolProviderService pps)
     {
-        inMeetingStatusPolicy.handleProtocolProvider(pps, null, false);
+        inMeetingStatusPolicy.handleProtocolProvider(pps, null, false, false);
     }
 
     /**