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

Adds option to add voicemail check URI to use it for checking voicemail messages.

Browse Source
cusax-fix
Damian Minkov 14 years ago
parent bf7d41d620
commit 854b7ca187
9 changed files with 116 additions and 22 deletions
Show Stats Download Patch File Download Diff File

7
resources/languages/resources.properties
Unescape View File

@ -475,6 +475,7 @@ service.gui.VOICEMAIL_NO_MESSAGES=No messages.
service.gui.VOICEMAIL_TITLE=Voice messages
service.gui.VOICEMAIL_TOOLTIP=Voice messages for:
service.gui.VOICEMAIL_TIP=Click the call button to hear your messages.
service.gui.VOICEMAIL_TIP_NO_ACCOUNT=Please configure URI for checking voicemail in account wizard
service.gui.VOLUME_CONTROL_TOOL_TIP=Adjust volume
service.gui.WAITING_AUTHORIZATION=Waiting for authorization
service.gui.WARNING=Warning
@ -1008,8 +1009,10 @@ plugin.sipaccregwizz.XCAP_USE_SIP_CREDENTIALS=Use SIP credentials
plugin.sipaccregwizz.XCAP_USER=User
plugin.sipaccregwizz.XCAP_PASSWORD=Password
plugin.sipaccregwizz.XCAP_SERVER_URI=Server URI/Address
plugin.sipaccregwizz.MWI=Message Waiting(MWI)
plugin.sipaccregwizz.VOICEMAIL_URI=Voicemail URI
plugin.sipaccregwizz.VOICEMAIL=Voicemail
plugin.sipaccregwizz.MWI=Message Waiting (MWI)
plugin.sipaccregwizz.VOICEMAIL_URI=Voicemail alias URI
plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Voicemail check URI
plugin.sipaccregwizz.NOT_SAME_PASSWORD=Your passwords did not match.
plugin.sipaccregwizz.NO_CERTIFICATE=<none> (use regular authentication)
plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP indication

2
src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
Unescape View File

@ -799,7 +799,7 @@ private void initButtonsPanel(UIContact uiContact)
null,
null);
if (telephonyContact != null ||
if ((telephonyContact != null && telephonyContact.getAddress() != null) ||
uiContact.getDescriptor() instanceof SourceContact ||
(hasPhone && providers.size() > 0))
{

12
src/net/java/sip/communicator/impl/gui/main/contactlist/notifsource/NotificationContact.java
Unescape View File

@ -38,6 +38,13 @@ public class NotificationContact
= GuiActivator.getResources()
.getI18NString("service.gui.VOICEMAIL_TIP");
/**
* Tooltip for missing account.
*/
private static final String VOICEMAIL_TIP_NO_ACCOUNT
= GuiActivator.getResources()
.getI18NString("service.gui.VOICEMAIL_TIP_NO_ACCOUNT");
/**
* The parent contact list group.
*/
@ -235,7 +242,10 @@ public ExtendedTooltip getToolTip()
tip.addLine(new JLabel[]{new JLabel(getDisplayDetails())});
tip.addLine(null, " ");
tip.setBottomText(VOICEMAIL_TIP);
if(notificationDetail != null && notificationDetail.getAddress() != null)
tip.setBottomText(VOICEMAIL_TIP);
else
tip.setBottomText(VOICEMAIL_TIP_NO_ACCOUNT);
return tip;
}

6
src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
Unescape View File

@ -419,7 +419,9 @@ protected void processActiveRequest(
try
{
String messageAccount = null;
String messageAccount =
provider.getAccountID().getAccountPropertyString(
ProtocolProviderFactory.VOICEMAIL_CHECK_URI);
BufferedReader input = new BufferedReader(new InputStreamReader(
new ByteArrayInputStream(rawContent)));
@ -482,7 +484,7 @@ else if(lcaseLine.startsWith(MessageType.VOICE.toString())
// what is the account to call for retrieving messages?
fireVoicemailNotificationEvent(
MessageType.VOICE.toString(),
null,
messageAccount,
1,
0,
0,

60
src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
Unescape View File

@ -40,7 +40,9 @@ public class ConnectionPanel
private final JTextField proxyPortField = new JTextField(4);
private final JTextField voicemailField = new JTextField(4);
private final JTextField voicemailAliasField = new JTextField(4);
private final JTextField voicemailCheckField = new JTextField(4);
private final JCheckBox proxyAutoCheckBox;
@ -205,29 +207,37 @@ public void actionPerformed(ActionEvent e)
mainPanel.add(Box.createVerticalStrut(5));
mainPanel.add(encryptionPanel);
JPanel voicemailPanel
= new TransparentPanel(new BorderLayout(10, 10));
JPanel voicemailUriPanel
= new TransparentPanel(new BorderLayout(10, 10));
JPanel voicemailPanel = new TransparentPanel(new BorderLayout(10, 10));
JPanel voicemailUriPanelLabels
= new TransparentPanel(new GridLayout(0, 1, 10, 10));
JPanel voicemailUriPanelValues
= new TransparentPanel(new GridLayout(0, 1, 10, 10));
mwiCheckBox = new SIPCommCheckBox(
Resources.getString("plugin.sipaccregwizz.MWI"),
regform.getRegistration().isMessageWaitingIndicationsEnabled());
voicemailUriPanel.add(new JLabel(
Resources.getString("plugin.sipaccregwizz.VOICEMAIL_URI")),
BorderLayout.WEST);
voicemailUriPanel.add(voicemailField, BorderLayout.CENTER);
voicemailField.setText(regform.getRegistration().getVoicemailURI());
voicemailUriPanelLabels.add(new JLabel(
Resources.getString("plugin.sipaccregwizz.VOICEMAIL_URI")));
voicemailUriPanelLabels.add(new JLabel(
Resources.getString("plugin.sipaccregwizz.VOICEMAIL_CHECK_URI")));
voicemailUriPanelValues.add(voicemailAliasField);
voicemailUriPanelValues.add(voicemailCheckField);
voicemailPanel.setBorder(BorderFactory.createTitledBorder(
Resources.getString("plugin.sipaccregwizz.VOICEMAIL")));
voicemailPanel.add(mwiCheckBox, BorderLayout.WEST);
voicemailPanel.add(voicemailUriPanel, BorderLayout.CENTER);
voicemailAliasField.setText(regform.getRegistration().getVoicemailURI());
voicemailCheckField.setText(regform.getRegistration().getVoicemailCheckURI());
mainPanel.add(Box.createVerticalStrut(5));
mainPanel.add(createDTMFPanel());
voicemailPanel.add(mwiCheckBox, BorderLayout.NORTH);
voicemailPanel.add(voicemailUriPanelLabels, BorderLayout.WEST);
voicemailPanel.add(voicemailUriPanelValues, BorderLayout.CENTER);
mainPanel.add(Box.createVerticalStrut(5));
mainPanel.add(voicemailPanel);
mainPanel.add(Box.createVerticalStrut(5));
mainPanel.add(createDTMFPanel());
this.add(mainPanel, BorderLayout.NORTH);
}
@ -620,7 +630,7 @@ else if(dtmfMethod.equals("INBAND_DTMF"))
*/
String getVoicemailURI()
{
return voicemailField.getText();
return voicemailAliasField.getText();
}
/**
@ -629,7 +639,25 @@ String getVoicemailURI()
*/
void setVoicemailURI(String voicemailURI)
{
voicemailField.setText(voicemailURI);
voicemailAliasField.setText(voicemailURI);
}
/**
* Returns the voicemail check URI.
* @return the voicemail URI.
*/
String getVoicemailCheckURI()
{
return voicemailCheckField.getText();
}
/**
* Sets the voicemail check URI.
* @param voicemailCheckURI the voicemail URI.
*/
void setVoicemailCheckURI(String voicemailCheckURI)
{
voicemailCheckField.setText(voicemailCheckURI);
}
/**

23
src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistration.java
Unescape View File

@ -97,6 +97,11 @@ public class SIPAccountRegistration
*/
private String voicemailURI;
/**
* The voicemail check uri if any.
*/
private String voicemailCheckURI;
/**
* Whether message waiting indications is enabled.
*/
@ -754,6 +759,24 @@ public void setVoicemailURI(String voicemailURI)
this.voicemailURI = voicemailURI;
}
/**
* The voicemail check URI.
* @return the voicemail URI.
*/
public String getVoicemailCheckURI()
{
return voicemailCheckURI;
}
/**
* Sets voicemail check URI.
* @param voicemailCheckURI new URI.
*/
public void setVoicemailCheckURI(String voicemailCheckURI)
{
this.voicemailCheckURI = voicemailCheckURI;
}
/**
* Check if messageWaitingIndications is enabled
*

6
src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java
Unescape View File

@ -313,6 +313,7 @@ public boolean commitPage(SIPAccountRegistration registration)
registration.setMessageWaitingIndications(
connectionPanel.isMessageWaitingEnabled());
registration.setVoicemailURI(connectionPanel.getVoicemailURI());
registration.setVoicemailCheckURI(connectionPanel.getVoicemailCheckURI());
return true;
}
@ -378,6 +379,8 @@ public void loadAccount(AccountID accountID)
String voicemailURI = accountID.getAccountPropertyString(
ProtocolProviderFactory.VOICEMAIL_URI);
String voicemailCheckURI = accountID.getAccountPropertyString(
ProtocolProviderFactory.VOICEMAIL_CHECK_URI);
boolean xCapEnable = accountID
.getAccountPropertyBoolean("XCAP_ENABLE", false);
@ -447,6 +450,9 @@ public void loadAccount(AccountID accountID)
if(!StringUtils.isNullOrEmpty(voicemailURI))
connectionPanel.setVoicemailURI(voicemailURI);
if(!StringUtils.isNullOrEmpty(voicemailCheckURI))
connectionPanel.setVoicemailCheckURI(voicemailCheckURI);
if(xCapEnable)
{
boolean xCapUseSipCredentials = accountID

16
src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
Unescape View File

@ -287,10 +287,17 @@ public Iterator<Map.Entry<String, String>> getSummary()
}
if(registration.isMessageWaitingIndicationsEnabled())
{
if(!StringUtils.isNullOrEmpty(registration.getVoicemailURI(), true))
summaryTable.put(
Resources.getString("plugin.sipaccregwizz.VOICEMAIL_URI"),
registration.getVoicemailURI());
if(!StringUtils.isNullOrEmpty(
registration.getVoicemailCheckURI(), true))
summaryTable.put(
Resources.getString("plugin.sipaccregwizz.VOICEMAIL_CHECK_URI"),
registration.getVoicemailURI());
}
return summaryTable.entrySet().iterator();
}
@ -554,6 +561,15 @@ else if(registration.isXiVOEnable())
else if(isModification())
accountProperties.put(ProtocolProviderFactory.VOICEMAIL_URI, "");
if(!StringUtils.isNullOrEmpty(
registration.getVoicemailCheckURI(), true))
accountProperties.put(
ProtocolProviderFactory.VOICEMAIL_CHECK_URI,
registration.getVoicemailCheckURI());
else if(isModification())
accountProperties.put(
ProtocolProviderFactory.VOICEMAIL_CHECK_URI, "");
if(isModification())
{
// remove the property as true is by default,

6
src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
Unescape View File

@ -389,6 +389,12 @@ public abstract class ProtocolProviderFactory
*/
public static final String VOICEMAIL_URI = "VOICEMAIL_URI";
/**
* Address used to call to hear your messages stored on the server
* for your voicemail.
*/
public static final String VOICEMAIL_CHECK_URI = "VOICEMAIL_CHECK_URI";
/**
* Indicates if calling is disabled for a certain account.
*/

Write Preview
Loading…
Cancel
Save