aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-08-30 13:15:00 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-08-30 13:15:00 +0200
commit7917c19d1853c890d08985d29c709f53ec8ae54b (patch)
tree5506586a71201edf400a38d7cab7900a4427539a
parent3685c8cd2a705d38d84f72fe363677e7a40d1043 (diff)
broader exception catchers
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java2
-rw-r--r--src/playstore/java/eu/siacs/conversations/services/PushManagementService.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
index 0b0cb408..38a201bd 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
+++ b/src/main/java/eu/siacs/conversations/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/eu/siacs/conversations/services/PushManagementService.java b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java
index 3fdaf832..ae86f8c2 100644
--- a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java
+++ b/src/playstore/java/eu/siacs/conversations/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();