Displays account display name when password is wrong.

Adds more logging when connecting using xmpp.
cusax-fix
Damian Minkov 14 years ago
parent 3066fea7c8
commit dc0feb41a0

@ -276,7 +276,7 @@ private void connectAndLogin(SecurityAuthority authority, int reasonCode)
//request a password from the user
credentials = authority.obtainCredentials(
getProtocolName(),
accountID.getDisplayName(),
credentials,
reasonCode);

@ -132,7 +132,7 @@ protected Agent createIceAgent()
//request a password from the user
credentials = provider.getAuthority().obtainCredentials(
ProtocolNames.JABBER,
accID.getDisplayName(),
credentials,
SecurityAuthority.AUTHENTICATION_REQUIRED);

@ -647,14 +647,21 @@ private void connectAndLogin(SecurityAuthority authority,
if(customXMPPDomain != null && !hadDnsSecException[0])
{
logger.info("Connect using custom xmpp domain: " +
customXMPPDomain);
state = connectUsingSRVRecords(
customXMPPDomain, password, serviceName,
hadDnsSecException);
logger.info("state for connectUsingSRVRecords: " + state);
if(hadDnsSecException[0])
{
setDnssecLoginFailure();
return;
}
if(state == ConnectState.ABORT_CONNECTING
|| state == ConnectState.STOP_TRYING)
return;
@ -784,6 +791,7 @@ private ConnectState connectUsingSRVRecords(
logger.error("DNSSEC failure for A/AAAA lookup of SRV", e);
dnssecState[0] = true;
}
if (addrs == null || addrs.length == 0)
{
logger.error("No A/AAAA addresses found for " +
@ -814,7 +822,12 @@ private ConnectState connectUsingSRVRecords(
}
catch(XMPPException ex)
{
logger.error("Error connecting to " + isa
+ " for domain:" + domain
+ " serviceName:" + serviceName, ex);
disconnectAndCleanConnection();
if(isAuthenticationFailed(ex))
throw ex;
}
@ -953,7 +966,7 @@ private String loadPassword(SecurityAuthority authority, int reasonCode)
//request a password from the user
credentials = authority.obtainCredentials(
ProtocolNames.JABBER,
getAccountID().getDisplayName(),
credentials,
reasonCode);

@ -164,7 +164,7 @@ private void connectAndLogin(SecurityAuthority authority, int reasonCode)
credentials
= authority
.obtainCredentials(
ProtocolNames.MSN,
accountID.getDisplayName(),
credentials,
reasonCode);

@ -724,7 +724,8 @@ private CredentialsCacheEntry createCcEntryWithNewCredentials(
defaultCredentials.setUserName(accountID.getUserID());
UserCredentials newCredentials = getSecurityAuthority()
.obtainCredentials( realm, defaultCredentials, reasonCode);
.obtainCredentials( accountID.getDisplayName(),
defaultCredentials, reasonCode);
// in case user has canceled the login window
if(newCredentials == null)

@ -142,7 +142,7 @@ private void connectAndLogin( SecurityAuthority authority,
//request a password from the user
credentials = authority.obtainCredentials(
ProtocolNames.YAHOO,
getAccountID().getDisplayName(),
credentials,
authReasonCode);

Loading…
Cancel
Save