vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 17:49:38 +02:00
Code Issues Releases Wiki Activity

Introduce SmackException

Browse source 
SmackException (and it's subclasses) is for all errors/exceptions not
defined by any XMPP specification. XMPPException is now an abstract
class for all errors defined by the XMPP specifications.

Methods that involve an IQ exchange now either return the result, which
is obtained by IQ response, or they throw an XMPPErrorException if an IQ
error was the result of the IQ set/get. If there was no response from
the server within the default packet timeout, a NoResponseException will
be thrown.

XMPP SASL errors are now also reported accordingly.

SMACK-426
This commit is contained in:
Florian Schmaus 2014-03-12 11:50:05 +01:00
parent 4b6f09f962
commit 4b56446e40
109 changed files with 2040 additions and 1599 deletions
Download patch file Download diff file Expand all files Collapse all files

31
experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java
View file

@ -20,11 +20,14 @@ import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.SmackException.NoResponseException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.ConnectionCreationListener;
import org.jivesoftware.smack.Manager;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.XMPPException.XMPPErrorException;
import org.jivesoftware.smack.filter.IQReplyFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Message;
@ -95,15 +98,12 @@ public class CarbonManager extends Manager {
* Returns true if XMPP Carbons are supported by the server.
*
* @return true if supported
* @throws SmackException if there was no response from the server.
* @throws XMPPException
*/
public boolean isSupportedByServer() {
try {
return ServiceDiscoveryManager.getInstanceFor(connection()).supportsFeature(
connection().getServiceName(), CarbonExtension.NAMESPACE);
}
catch (XMPPException e) {
return false;
}
public boolean isSupportedByServer() throws XMPPException, SmackException {
return ServiceDiscoveryManager.getInstanceFor(connection()).supportsFeature(
connection().getServiceName(), CarbonExtension.NAMESPACE);
}
/**
@ -138,11 +138,14 @@ public class CarbonManager extends Manager {
* You should first check for support using isSupportedByServer().
*
* @param new_state whether carbons should be enabled or disabled
* @throws XMPPErrorException
* @throws NoResponseException
*
* @throws XMPPException
*/
public void setCarbonsEnabled(final boolean new_state) throws XMPPException {
if (enabled_state == new_state) return;
public synchronized void setCarbonsEnabled(final boolean new_state) throws NoResponseException,
XMPPErrorException {
if (enabled_state == new_state)
return;
IQ setIQ = carbonsEnabledIQ(new_state);
@ -154,8 +157,9 @@ public class CarbonManager extends Manager {
* Helper method to enable carbons.
*
* @throws XMPPException
* @throws SmackException if there was no response from the server.
*/
public void enableCarbons() throws XMPPException {
public void enableCarbons() throws XMPPException, SmackException {
setCarbonsEnabled(true);
}
@ -163,8 +167,9 @@ public class CarbonManager extends Manager {
* Helper method to disable carbons.
*
* @throws XMPPException
* @throws SmackException if there was no response from the server.
*/
public void disableCarbons() throws XMPPException {
public void disableCarbons() throws XMPPException, SmackException {
setCarbonsEnabled(false);
}