aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-08-30 13:15:00 +0200
committerChristian Schneppe <christian@pix-art.de>2016-09-02 23:12:31 +0200
commit53d2f53f0ade22ac2fb79d0b5a25b01dae0e06cf (patch)
tree35c89b97571326cd94b651fd2d304ee9bd26b3a9
parentc07eb6e4f68cd6fb77e708acea8580e70038bed4 (diff)
broader exception catchers
-rw-r--r--src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java2
-rw-r--r--src/playstore/java/de/pixart/messenger/services/PushManagementService.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
index e8b7d45d8..4e45c2a03 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
@@ -209,7 +209,7 @@ public class JingleInbandTransport extends JingleTransport {
} else {
connection.updateProgress((int) ((((double) (this.fileSize - this.remainingSize)) / this.fileSize) * 100));
}
- } catch (IOException e) {
+ } catch (Exception e) {
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": "+e.getMessage());
FileBackend.close(fileOutputStream);
this.onFileTransmissionStatusChanged.onFileTransferAborted();
diff --git a/src/playstore/java/de/pixart/messenger/services/PushManagementService.java b/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
index 85f742775..77ec83aad 100644
--- a/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
+++ b/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
@@ -92,7 +92,8 @@ public class PushManagementService {
try {
String token = instanceID.getToken(mXmppConnectionService.getString(R.string.gcm_defaultSenderId), GoogleCloudMessaging.INSTANCE_ID_SCOPE, null);
instanceTokenRetrieved.onGcmInstanceTokenRetrieved(token);
- } catch (IOException e) {
+ } catch (Exception e) {
+ Log.d(Config.LOGTAG,"unable to get push token");
}
}
}).start();