Added multichat operation set definition and Gibberish protocol implementation. Related issues: Issue #241 , Issue #244, Issue #250

Fixed comparison. A status equal to the online threshold is still online.
cusax-fix
Emil Ivov 19 years ago
parent 3670cdf530
commit 6dcf1fe1b3

@ -156,10 +156,10 @@ public void runLogin(MainFrame parent)
.getProtocolProviderLastStatus(protocolProvider);
if (status == null
|| status.equals(Constants.ONLINE_STATUS)
|| status.equals(Constants.ONLINE_STATUS)
|| ((status instanceof PresenceStatus)
&& (((PresenceStatus)status).getStatus()
> PresenceStatus.ONLINE_THRESHOLD)))
&& (((PresenceStatus)status).getStatus()
>= PresenceStatus.ONLINE_THRESHOLD)))
{
this.login(protocolProvider);
}
@ -204,10 +204,10 @@ private void showAccountRegistrationWizard()
public void registrationStateChanged(RegistrationStateChangeEvent evt)
{
ProtocolProviderService protocolProvider = evt.getProvider();
logger.trace("Protocol provider: " + protocolProvider
+ " changed its state to: " + evt.getNewState().getStateName());
OperationSetPresence presence = mainFrame
.getProtocolPresence(protocolProvider);
@ -291,7 +291,7 @@ else if (evt.getNewState().equals(RegistrationState.EXPIRED)) {
else if (evt.getNewState().equals(RegistrationState.UNREGISTERED)) {
this.mainFrame.getStatusPanel().updateStatus(evt.getProvider());
if(mainFrame.getCallManager().containsCallAccount(protocolProvider))
{
this.mainFrame.getCallManager()
@ -395,7 +395,7 @@ private void handleProviderAdded(ProtocolProviderService protocolProvider)
{
logger.trace("The following protocol provider was just added: "
+ protocolProvider.getAccountID().getAccountAddress());
protocolProvider.addRegistrationStateChangeListener(this);
this.mainFrame.addProtocolProvider(protocolProvider);
@ -403,10 +403,10 @@ private void handleProviderAdded(ProtocolProviderService protocolProvider)
.getProtocolProviderLastStatus(protocolProvider);
if (status == null
|| status.equals(Constants.ONLINE_STATUS)
|| status.equals(Constants.ONLINE_STATUS)
|| ((status instanceof PresenceStatus)
&& (((PresenceStatus)status).getStatus()
> PresenceStatus.ONLINE_THRESHOLD)))
&& (((PresenceStatus)status).getStatus()
>= PresenceStatus.ONLINE_THRESHOLD)))
{
this.login(protocolProvider);
}

Loading…
Cancel
Save