narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

improve logging for throws from native callbacks

Browse source
This commit is contained in:
Daniel Gultsch 2020-04-21 12:00:13 +02:00
parent eb911b8196
commit 5b12e23382
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
View file

@ -90,7 +90,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
final boolean sessionEnded = this.endedSessions.asMap().containsKey(PersistableSessionId.of(id)); final boolean sessionEnded = this.endedSessions.asMap().containsKey(PersistableSessionId.of(id));
final boolean stranger = isWithStrangerAndStrangerNotificationsAreOff(account, id.with); final boolean stranger = isWithStrangerAndStrangerNotificationsAreOff(account, id.with);
if (isBusy() || sessionEnded || stranger) { if (isBusy() || sessionEnded || stranger) {
Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": rejected session with " + id.with + " because busy. sessionEnded=" + sessionEnded+", stranger="+stranger); Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": rejected session with " + id.with + " because busy. sessionEnded=" + sessionEnded + ", stranger=" + stranger);
mXmppConnectionService.sendIqPacket(account, packet.generateResponse(IqPacket.TYPE.RESULT), null); mXmppConnectionService.sendIqPacket(account, packet.generateResponse(IqPacket.TYPE.RESULT), null);
final JinglePacket sessionTermination = new JinglePacket(JinglePacket.Action.SESSION_TERMINATE, id.sessionId); final JinglePacket sessionTermination = new JinglePacket(JinglePacket.Action.SESSION_TERMINATE, id.sessionId);
sessionTermination.setTo(id.with); sessionTermination.setTo(id.with);
@ -220,7 +220,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
if (isBusy() || stranger) { if (isBusy() || stranger) {
writeLogMissedIncoming(account, id.with.asBareJid(), id.sessionId, serverMsgId, timestamp); writeLogMissedIncoming(account, id.with.asBareJid(), id.sessionId, serverMsgId, timestamp);
if (stranger) { if (stranger) {
Log.d(Config.LOGTAG,id.account.getJid().asBareJid()+": ignoring call proposal from stranger "+id.with); Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": ignoring call proposal from stranger " + id.with);
return; return;
} }
final int activeDevices = account.countPresences(); final int activeDevices = account.countPresences();
@ -545,7 +545,9 @@ public class JingleConnectionManager extends AbstractConnectionManager {
if (connections.containsValue(connection)) { if (connections.containsValue(connection)) {
return; return;
} }
throw new IllegalStateException("JingleConnection has not been registered with connection manager"); final IllegalStateException e = new IllegalStateException("JingleConnection has not been registered with connection manager");
Log.e(Config.LOGTAG, "ensureConnectionIsRegistered() failed. Going to throw", e);
throw e;
} }
public void endSession(AbstractJingleConnection.Id id, final AbstractJingleConnection.State state) { public void endSession(AbstractJingleConnection.Id id, final AbstractJingleConnection.State state) {

4
src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java
View file

@ -254,7 +254,9 @@ public class WebRTCWrapper {
|| this.eglBase != null || this.eglBase != null
|| this.localVideoTrack != null || this.localVideoTrack != null
|| this.remoteVideoTrack != null) { || this.remoteVideoTrack != null) {
throw new IllegalStateException("WebRTCWrapper hasn't been closed properly"); final IllegalStateException e = new IllegalStateException("WebRTCWrapper hasn't been closed properly");
Log.e(Config.LOGTAG, "verifyClosed() failed. Going to throw", e);
throw e;
} }
} }