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

Replaced #getHost with #getServiceName. SMACK-75 

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2731 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Gaston Dombiak 2005-08-27 02:24:38 +00:00 committed by gato
parent 523beeac55
commit 59e393e2ef
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/org/jivesoftware/smack/AccountManager.java
View File

@ -186,7 +186,7 @@ public class AccountManager {
} }
Registration reg = new Registration(); Registration reg = new Registration();
reg.setType(IQ.Type.SET); reg.setType(IQ.Type.SET);
reg.setTo(connection.getHost()); reg.setTo(connection.getServiceName());
attributes.put("username",username); attributes.put("username",username);
attributes.put("password",password); attributes.put("password",password);
reg.setAttributes(attributes); reg.setAttributes(attributes);
@ -216,7 +216,7 @@ public class AccountManager {
public void changePassword(String newPassword) throws XMPPException { public void changePassword(String newPassword) throws XMPPException {
Registration reg = new Registration(); Registration reg = new Registration();
reg.setType(IQ.Type.SET); reg.setType(IQ.Type.SET);
reg.setTo(connection.getHost()); reg.setTo(connection.getServiceName());
HashMap map = new HashMap(); HashMap map = new HashMap();
map.put("username",StringUtils.parseName(connection.getUser())); map.put("username",StringUtils.parseName(connection.getUser()));
map.put("password",newPassword); map.put("password",newPassword);
@ -250,7 +250,7 @@ public class AccountManager {
} }
Registration reg = new Registration(); Registration reg = new Registration();
reg.setType(IQ.Type.SET); reg.setType(IQ.Type.SET);
reg.setTo(connection.getHost()); reg.setTo(connection.getServiceName());
Map attributes = new HashMap(); Map attributes = new HashMap();
// To delete an account, we add a single attribute, "remove", that is blank. // To delete an account, we add a single attribute, "remove", that is blank.
attributes.put("remove", ""); attributes.put("remove", "");
@ -277,7 +277,7 @@ public class AccountManager {
*/ */
private synchronized void getRegistrationInfo() throws XMPPException { private synchronized void getRegistrationInfo() throws XMPPException {
Registration reg = new Registration(); Registration reg = new Registration();
reg.setTo(connection.getHost()); reg.setTo(connection.getServiceName());
PacketFilter filter = new AndFilter(new PacketIDFilter(reg.getPacketID()), PacketFilter filter = new AndFilter(new PacketIDFilter(reg.getPacketID()),
new PacketTypeFilter(IQ.class)); new PacketTypeFilter(IQ.class));
PacketCollector collector = connection.createPacketCollector(filter); PacketCollector collector = connection.createPacketCollector(filter);

2
source/org/jivesoftware/smackx/muc/MultiUserChat.java
View File

@ -206,7 +206,7 @@ public class MultiUserChat {
public static Collection getServiceNames(XMPPConnection connection) throws XMPPException { public static Collection getServiceNames(XMPPConnection connection) throws XMPPException {
List answer = new ArrayList(); List answer = new ArrayList();
ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection); ServiceDiscoveryManager discoManager = ServiceDiscoveryManager.getInstanceFor(connection);
DiscoverItems items = discoManager.discoverItems(connection.getHost()); DiscoverItems items = discoManager.discoverItems(connection.getServiceName());
for (Iterator it = items.getItems(); it.hasNext();) { for (Iterator it = items.getItems(); it.hasNext();) {
DiscoverItems.Item item = (DiscoverItems.Item) it.next(); DiscoverItems.Item item = (DiscoverItems.Item) it.next();
DiscoverInfo info = discoManager.discoverInfo(item.getEntityID()); DiscoverInfo info = discoManager.discoverInfo(item.getEntityID());