sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes NPE when creating a call and the calendar service is not registered.

Browse Source
fix-message-formatting
hristoterezov 12 years ago
parent 2add59b51b
commit 395d0c8187
4 changed files with 68 additions and 64 deletions
Show Stats Download Patch File Download Diff File

10
src/net/java/sip/communicator/plugin/addrbook/AddrBookActivator.java
Unescape View File

@ -105,7 +105,7 @@ public class AddrBookActivator
/**
* List of the providers with registration listener.
*/
private static List<ProtocolProviderService> providers
private static List<ProtocolProviderService> providers
= new ArrayList<ProtocolProviderService>();
/**
@ -116,7 +116,7 @@ public class AddrBookActivator
/**
* The registration change listener.
*/
private static RegistrationStateChangeListener providerListener
private static RegistrationStateChangeListener providerListener
= new RegistrationStateChangeListener()
{
@Override
@ -132,7 +132,7 @@ public void registrationStateChanged(
};
/**
* A listener for addition of <tt>ProtocolProviderService</tt>
* A listener for addition of <tt>ProtocolProviderService</tt>
*/
private static ServiceListener serviceListener
= new ServiceListener()
@ -402,7 +402,7 @@ static void startCalendarService()
false))
{
calendarService = new CalendarServiceImpl();
try
{
MsOutlookAddrBookContactSourceService.initMAPI(null);
@ -506,7 +506,7 @@ public static void unsetDefaultIMApplication()
public static List<ProtocolProviderService> getProtocolProviders()
{
ServiceReference[] ppsRefs;
List<ProtocolProviderService> result
List<ProtocolProviderService> result
= new ArrayList<ProtocolProviderService>();
try

90
src/net/java/sip/communicator/plugin/addrbook/msoutlook/calendar/CalendarServiceImpl.java
Unescape View File

@ -18,8 +18,8 @@
import net.java.sip.communicator.util.*;
/**
* A implementation of <tt>CalendarService</tt> for MS Outlook calendar.
* The class resolves the free busy status and also changes the presence status
* A implementation of <tt>CalendarService</tt> for MS Outlook calendar.
* The class resolves the free busy status and also changes the presence status
* according to free busy status.
*
* @author Hristo Terezov
@ -36,7 +36,7 @@ public enum MAPIType
PT_BOOL,
PT_BINARY
};
/**
* Response statuses of the calendar events (meeting objects).
*/
@ -46,46 +46,46 @@ public static enum ResponseStatus
* No response is required for this object.
*/
respNone(0x00000000),
/**
* This meeting belongs to the organizer.
*/
respOrganized(0x00000001),
/**
* This value on the attendee's meeting indicates that the attendee has
* This value on the attendee's meeting indicates that the attendee has
* tentatively accepted the meeting request.
*/
respTentative(0x00000002),
/**
* This value on the attendee's meeting t indicates that the attendee
* This value on the attendee's meeting t indicates that the attendee
* has accepted the meeting request.
*/
respAccepted(0x00000003),
/**
* This value on the attendee's meeting indicates that the attendee has
* This value on the attendee's meeting indicates that the attendee has
* declined the meeting request.
*/
respDeclined(0x00000004),
/**
* This value on the attendee's meeting indicates the attendee has not
* This value on the attendee's meeting indicates the attendee has not
* yet responded.
*/
respNotResponded(0x00000005);
/**
* The ID of the property
*/
private final long id;
private ResponseStatus(int id)
{
this.id = id;
}
/**
* Finds <tt>ResponseStatuse</tt> instance by given value of the status.
* @param value the value of the status we are searching for.
@ -142,7 +142,7 @@ public static enum MAPICalendarProperties
* A property with information about the recurrent pattern of the event.
*/
PidLidAppointmentRecur(0x00008216, MAPIType.PT_BINARY),
/**
* A property with information about the accepted state of the event.
*/
@ -159,7 +159,7 @@ public static enum MAPICalendarProperties
private final MAPIType type;
/**
* Constructs new property.
* Constructs new property.
* @param id the id
* @param type the type
*/
@ -223,7 +223,7 @@ public static MAPICalendarProperties getByOrderId(int i)
/**
* A list with currently active <tt>CalendarItemTimerTask</tt>s
*/
private List<CalendarItemTimerTask> currentCalendarItems
private List<CalendarItemTimerTask> currentCalendarItems
= new LinkedList<CalendarItemTimerTask>();
/**
@ -239,10 +239,10 @@ public static MAPICalendarProperties getByOrderId(int i)
private BusyStatusEnum currentState = BusyStatusEnum.FREE;
/**
* Instance of <tt>InMeetingStatusPolicy</tt> class which is used to update
* Instance of <tt>InMeetingStatusPolicy</tt> class which is used to update
* the presence status according the current free busy status.
*/
private InMeetingStatusPolicy inMeetingStatusPolicy
private InMeetingStatusPolicy inMeetingStatusPolicy
= new InMeetingStatusPolicy();
/**
@ -328,12 +328,12 @@ private static native void getAllCalendarItems(
* @return array of property values for the given calendar item.
* @throws MsOutlookMAPIHResultException
*/
public static native Object[] IMAPIProp_GetProps(String entryId,
public static native Object[] IMAPIProp_GetProps(String entryId,
long[] propIds, long flags)
throws MsOutlookMAPIHResultException;
/**
* Gets the property values of given calendar item and creates
* Gets the property values of given calendar item and creates
* <tt>CalendarItemTimerTask</tt> instance for it.
* @param id The outlook calendar item identifier.
*
@ -344,15 +344,15 @@ private synchronized void insert(String id)
throws MsOutlookMAPIHResultException
{
Object[] props = null;
props
= IMAPIProp_GetProps(id, MAPICalendarProperties.getALLPropertyIDs(),
props
= IMAPIProp_GetProps(id, MAPICalendarProperties.getALLPropertyIDs(),
MAPI_UNICODE);
addCalendarItem(props, id);
}
/**
* Parses the property values of calendar item and creates
* Parses the property values of calendar item and creates
* <tt>CalendarItemTimerTask</tt> instance for the calendar item.
* @param props the property values.
* @param id the ID of the calendar item.
@ -368,14 +368,14 @@ private void addCalendarItem(Object[] props, String id)
{
if(props[i] == null)
continue;
MAPICalendarProperties propertyName
MAPICalendarProperties propertyName
= MAPICalendarProperties.getByOrderId(i);
switch(propertyName)
{
case PidLidAppointmentStartWhole:
try
{
long time
long time
= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z")
.parse((String)props[i] + " UTC").getTime();
startTime = new Date(time);
@ -389,7 +389,7 @@ private void addCalendarItem(Object[] props, String id)
case PidLidAppointmentEndWhole:
try
{
long time
long time
= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z")
.parse((String)props[i] + " UTC").getTime();
endTime = new Date(time);
@ -410,12 +410,12 @@ private void addCalendarItem(Object[] props, String id)
recurringData = ((byte[])props[i]);
break;
case PidLidResponseStatus:
responseStatus
responseStatus
= ResponseStatus.getFromLong((Long) props[i]);
break;
}
}
if(responseStatus != ResponseStatus.respNone
&& responseStatus != ResponseStatus.respAccepted
&& responseStatus != ResponseStatus.respOrganized)
@ -434,11 +434,11 @@ private void addCalendarItem(Object[] props, String id)
CalendarItemTimerTask task = null;
if(recurringData != null)
{
task = new CalendarItemTimerTask(status, startTime, endTime, id,
task = new CalendarItemTimerTask(status, startTime, endTime, id,
executeNow, null);
try
{
RecurringPattern pattern
RecurringPattern pattern
= new RecurringPattern(recurringData, task);
task.setPattern(pattern);
}
@ -474,7 +474,7 @@ private static String bytesToHex(byte[] bytes) {
sb.append(String.format("%02x", b & 0xff));
return sb.toString();
}
/**
* Changes the value of the current status
* @param state the new value.
@ -492,10 +492,10 @@ protected void setCurrentState(BusyStatusEnum state)
}
}
/**
* Handles presence status changed from "On the Phone"
*
*
* @param presenceStatuses the remembered presence statuses
* @return <tt>true</tt> if the status is changed.
*/
@ -511,7 +511,7 @@ public boolean onThePhoneStatusChanged(
}
/**
* Calculates and changes the value of current status using the current
* Calculates and changes the value of current status using the current
* active calendar items and their statuses.
*/
public void updateStateFromCurrentItems()
@ -600,7 +600,7 @@ public void onThePhoneStatusChanged(
for(ProtocolProviderService pps : presenceStatuses.keySet())
rememberPresenceStatus(pps, presenceStatuses.get(pps));
}
/**
* Returns the remembered presence statuses
* @return the remembered presence statuses
@ -609,7 +609,7 @@ public Map<ProtocolProviderService,PresenceStatus> getRememberedStatuses()
{
return presenceStatuses;
}
/**
* Finds the first <tt>PresenceStatus</tt> among the set of
* <tt>PresenceStatus</tt>es supported by a specific
@ -695,7 +695,7 @@ private void forgetPresenceStatuses()
/**
* Determines whether the free busy status is busy or not
*
* @return <tt>true</tt> if the status is busy and <tt>false</tt> if the
* @return <tt>true</tt> if the status is busy and <tt>false</tt> if the
* status is free
*/
private boolean isInMeeting()
@ -764,7 +764,7 @@ private void run(boolean onThePhoneStatusChanged)
}
}
public void handleProtocolProvider(ProtocolProviderService pps,
public void handleProtocolProvider(ProtocolProviderService pps,
Boolean isInMeeting, boolean onThePhoneStatusChanged)
{
if(isInMeeting == null)
@ -786,8 +786,8 @@ else if (pps.isRegistered())
{
PresenceStatus inMeetingPresenceStatus
= findInMeetingPresenceStatus(presence);
PresenceStatus onThePhone
PresenceStatus onThePhone
= findOnThePhonePresenceStatus(presence);
if (inMeetingPresenceStatus == null)
@ -814,8 +814,8 @@ else if (isInMeeting)
forgetPresenceStatus(pps);
}
else if (!inMeetingPresenceStatus.equals(
presenceStatus)
&& (!presenceStatus.equals(onThePhone)
presenceStatus)
&& (!presenceStatus.equals(onThePhone)
|| onThePhoneStatusChanged))
{
publishPresenceStatus(
@ -940,7 +940,7 @@ public void handleProviderAdded(ProtocolProviderService pps)
{
inMeetingStatusPolicy.handleProtocolProvider(pps, null, false);
}
/**
* Returns the remembered presence statuses
* @return the remembered presence statuses

9
src/net/java/sip/communicator/service/protocol/ProtocolProviderActivator.java
Unescape View File

@ -130,11 +130,14 @@ public static CalendarService getCalendarService()
{
if (calendarService == null)
{
ServiceReference serviceReference
= bundleContext.getServiceReference(
CalendarService.class.getName());
if(serviceReference == null)
return null;
calendarService
= (CalendarService)
bundleContext.getService(
bundleContext.getServiceReference(
CalendarService.class.getName()));
bundleContext.getService(serviceReference);
}
return calendarService;
}

23
src/net/java/sip/communicator/service/protocol/SingleCallInProgressPolicy.java
Unescape View File

@ -701,7 +701,7 @@ private PresenceStatus findInMeetingPresenceStatus(
}
return null;
}
/**
* Applies this policy to the current state of the application.
*/
@ -735,11 +735,11 @@ private void run()
else
{
boolean isOnThePhone = isOnThePhone();
CalendarService calendar
CalendarService calendar
= ProtocolProviderActivator.getCalendarService();
if(!isOnThePhone &&
if(!isOnThePhone && calendar != null &&
calendar.onThePhoneStatusChanged(presenceStatuses))
{
forgetPresenceStatuses();
@ -801,16 +801,17 @@ else if (!onThePhonePresenceStatus.equals(
publishPresenceStatus(
presence,
onThePhonePresenceStatus);
if(presenceStatus.equals(
findInMeetingPresenceStatus(presence)))
findInMeetingPresenceStatus(presence))
&& calendar != null)
{
Map<ProtocolProviderService,PresenceStatus>
statuses
Map<ProtocolProviderService,PresenceStatus>
statuses
= calendar.getRememberedStatuses();
for(ProtocolProviderService provider
for(ProtocolProviderService provider
: statuses.keySet())
rememberPresenceStatus(provider,
rememberPresenceStatus(provider,
statuses.get(provider));
}
else if (onThePhonePresenceStatus.equals(

Write Preview
Loading…
Cancel
Save