diff options
| author | Christian Schneppe <christian@pix-art.de> | 2019-09-03 20:31:32 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2019-09-03 20:31:32 +0200 |
| commit | be82ac563323ed83427b3ad692650c8283ce5338 (patch) | |
| tree | 53dfcd82ec65e0b523c3790c3b57539a2aa0442b /src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | |
| parent | 4aa24e84c49348f8d96c273f77a636557dbb40a2 (diff) | |
fix some crashes
Diffstat (limited to 'src/main/java/de/pixart/messenger/xmpp/XmppConnection.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index 9ff9e8bce..9f0d9a0fe 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -408,11 +408,17 @@ public class XmppConnection implements Runnable { this.changeStatus(Account.State.MISSING_INTERNET_PERMISSION); } catch (final StateChangingException e) { this.changeStatus(e.state); - } catch (final UnknownHostException | ConnectException e) { + } catch (final UnknownHostException e) { + this.changeStatus(Account.State.SERVER_NOT_FOUND); + } catch (final ConnectException e) { this.changeStatus(Account.State.SERVER_NOT_FOUND); } catch (final SocksSocketFactory.SocksProxyNotFoundException e) { this.changeStatus(Account.State.TOR_NOT_AVAILABLE); - } catch (final IOException | XmlPullParserException e) { + } catch (final IOException e) { + Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": " + e.getMessage()); + this.changeStatus(Account.State.OFFLINE); + this.attempt = Math.max(0, this.attempt - 1); + } catch (final XmlPullParserException e) { Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": " + e.getMessage()); this.changeStatus(Account.State.OFFLINE); this.attempt = Math.max(0, this.attempt - 1); @@ -640,7 +646,9 @@ public class XmppConnection implements Runnable { if (acknowledgedMessages) { mXmppConnectionService.updateConversationUi(); } - } catch (NumberFormatException | NullPointerException e) { + } catch (NumberFormatException e) { + Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": server send ack without sequence number"); + } catch (NullPointerException e) { Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": server send ack without sequence number"); } } else if (nextTag.isStart("failed")) { @@ -655,7 +663,9 @@ public class XmppConnection implements Runnable { if (acknowledgedMessages) { mXmppConnectionService.updateConversationUi(); } - } catch (NumberFormatException | NullPointerException e) { + } catch (NumberFormatException e) { + Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": resumption failed"); + } catch (NullPointerException e) { Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": resumption failed"); } resetStreamId(); @@ -859,7 +869,10 @@ public class XmppConnection implements Runnable { throw new StateChangingException(Account.State.STREAM_OPENING_ERROR); } sslSocket.close(); - } catch (final NoSuchAlgorithmException | KeyManagementException e1) { + } catch (final NoSuchAlgorithmException e1) { + Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": TLS certificate verification failed"); + throw new StateChangingException(Account.State.TLS_ERROR); + } catch (final KeyManagementException e1) { Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": TLS certificate verification failed"); throw new StateChangingException(Account.State.TLS_ERROR); } |