X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/cf0cc50e328c0fc4fcbbecfa0ed21887613110a1..b064f1e7a1ab6bdc8758fa11a6989a1a9057f8a6:/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 3f418de8..380b00ee 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -278,7 +278,7 @@ class ManagerImpl implements Manager {
     public List<Device> getLinkedDevices() throws IOException {
         var devices = dependencies.getAccountManager().getDevices();
         account.setMultiDevice(devices.size() > 1);
-        var identityKey = account.getIdentityKeyPair().getPrivateKey();
+        var identityKey = account.getAciIdentityKeyPair().getPrivateKey();
         return devices.stream().map(d -> {
             String deviceName = d.getName();
             if (deviceName != null) {
@@ -568,7 +568,7 @@ class ManagerImpl implements Manager {
             final var recipientId = context.getRecipientHelper().resolveRecipient(m.recipient());
             mentions.add(new SignalServiceDataMessage.Mention(context.getRecipientHelper()
                     .resolveSignalServiceAddress(recipientId)
-                    .getAci(), m.start(), m.length()));
+                    .getServiceId(), m.start(), m.length()));
         }
         return mentions;
     }
@@ -770,7 +770,7 @@ class ManagerImpl implements Manager {
                     Stream.concat(messageHandlers.stream(), weakHandlers.stream()).forEach(h -> {
                         try {
                             h.handleMessage(envelope, e);
-                        } catch (Exception ex) {
+                        } catch (Throwable ex) {
                             logger.warn("Message handler failed, ignoring", ex);
                         }
                     });