From 4aa8e3f2f2d10040de2ff57f39a70a0149ce5811 Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 22 Dec 2021 11:19:22 +0100 Subject: [PATCH] Catch all exceptions when deserializig session records --- .../java/org/asamk/signal/manager/storage/SignalAccount.java | 2 +- .../org/asamk/signal/manager/storage/sessions/SessionStore.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index d823f641..821c9cc9 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -582,7 +582,7 @@ public class SignalAccount implements Closeable { try { sessionStore.storeSession(new SignalProtocolAddress(session.address.getIdentifier(), session.deviceId), new SessionRecord(session.sessionRecord)); - } catch (IOException e) { + } catch (Exception e) { logger.warn("Failed to migrate session, ignoring", e); } } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java index 879a276d..b1713e9b 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java @@ -284,7 +284,7 @@ public class SessionStore implements SignalServiceSessionStore { final var session = new SessionRecord(inputStream.readAllBytes()); cachedSessions.put(key, session); return session; - } catch (IOException e) { + } catch (Exception e) { logger.warn("Failed to load session, resetting session: {}", e.getMessage()); return null; } -- 2.50.1