From d63312443d890eea5b8071e5dbcc7643832db049 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 30 Mar 2018 01:49:12 +0200
Subject: [PATCH] Fix an issue where minor issues caused crash reports to be
written
---
.../java/de/kuschku/libquassel/session/ProtocolHandler.kt | 4 ++++
malheur/src/main/java/de/kuschku/malheur/CrashHandler.kt | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt b/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt
index 292dc67be..d6b239c38 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt
@@ -43,6 +43,8 @@ abstract class ProtocolHandler(
if (!super<SignalProxy>.handle(f)) {
log(DEBUG, "ProtocolHandler", "No receiver registered for $f")
}
+ } catch (e: ObjectNotFoundException) {
+ log(DEBUG, "ProtocolHandler", "An error has occured while processing $f", e)
} catch (e: Throwable) {
exceptionHandler.invoke(MessageHandlingException.SignalProxy(f, e))
}
@@ -56,6 +58,8 @@ abstract class ProtocolHandler(
if (!super<AuthHandler>.handle(f)) {
log(DEBUG, "ProtocolHandler", "No receiver registered for $f")
}
+ } catch (e: ObjectNotFoundException) {
+ log(DEBUG, "ProtocolHandler", "An error has occured while processing $f", e)
} catch (e: Throwable) {
exceptionHandler.invoke(MessageHandlingException.Handshake(f, e))
}
diff --git a/malheur/src/main/java/de/kuschku/malheur/CrashHandler.kt b/malheur/src/main/java/de/kuschku/malheur/CrashHandler.kt
index 487462636..0e7d0b707 100644
--- a/malheur/src/main/java/de/kuschku/malheur/CrashHandler.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/CrashHandler.kt
@@ -60,9 +60,9 @@ object CrashHandler {
crashFile.writeText(json)
Log.e("Malheur", "Crash report saved: $crashFile", throwable)
handler.post {
- Toast.makeText(application,
- "Crash report saved: ${crashFile.name}",
- Toast.LENGTH_LONG).show()
+ Toast.makeText(
+ application, "Crash report saved: ${crashFile.name}", Toast.LENGTH_LONG
+ ).show()
}
} catch (e: Throwable) {
e.printStackTrace()
--
GitLab