Implement removing linked devices

[signal-cli] / src / main / java / org / asamk / signal / Manager.java

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index de37cc92c98823e4f4517609f443d907dd3e0727..47699c3f78e589caa4aeeaccd3449320f71b1e64 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -79,7 +79,7 @@ class Manager implements Signal {
 
     private final ObjectMapper jsonProcessot = new ObjectMapper();
     private String username;
-    int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
+    private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
     private String password;
     private String signalingKey;
     private int preKeyIdOffset;
@@ -107,6 +107,10 @@ class Manager implements Signal {
         return username;
     }
 
+    public int getDeviceId() {
+        return deviceId;
+    }
+
     public String getFileName() {
         new File(dataPath).mkdirs();
         return dataPath + "/" + username;
@@ -256,6 +260,13 @@ class Manager implements Signal {
         save();
     }
 
+    public List<DeviceInfo> getLinkedDevices() throws IOException {
+        return accountManager.getDevices();
+    }
+
+    public void removeLinkedDevices(int deviceId) throws IOException {
+        accountManager.removeDevice(deviceId);
+    }
 
     public static Map<String, String> getQueryMap(String query) {
         String[] params = query.split("&");
@@ -548,36 +559,39 @@ class Manager implements Signal {
 
     private void sendMessage(SignalServiceDataMessage message, Collection<String> recipients)
             throws IOException, EncapsulatedExceptions, UntrustedIdentityException {
-        SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
-                deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
+        try {
+            SignalServiceMessageSender messageSender = new SignalServiceMessageSender(URL, TRUST_STORE, username, password,
+                    deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
 
-        Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
-        for (String recipient : recipients) {
-            try {
-                recipientsTS.add(getPushAddress(recipient));
-            } catch (InvalidNumberException e) {
-                System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
-                System.err.println("Aborting sending.");
-                save();
-                return;
+            Set<SignalServiceAddress> recipientsTS = new HashSet<>(recipients.size());
+            for (String recipient : recipients) {
+                try {
+                    recipientsTS.add(getPushAddress(recipient));
+                } catch (InvalidNumberException e) {
+                    System.err.println("Failed to add recipient \"" + recipient + "\": " + e.getMessage());
+                    System.err.println("Aborting sending.");
+                    save();
+                    return;
+                }
             }
-        }
 
-        if (message.getGroupInfo().isPresent()) {
-            messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
-        } else {
-            // Send to all individually, so sync messages are sent correctly
-            for (SignalServiceAddress address : recipientsTS) {
-                messageSender.sendMessage(address, message);
+            if (message.getGroupInfo().isPresent()) {
+                messageSender.sendMessage(new ArrayList<>(recipientsTS), message);
+            } else {
+                // Send to all individually, so sync messages are sent correctly
+                for (SignalServiceAddress address : recipientsTS) {
+                    messageSender.sendMessage(address, message);
+                }
             }
-        }
 
-        if (message.isEndSession()) {
-            for (SignalServiceAddress recipient : recipientsTS) {
-                handleEndSession(recipient.getNumber());
+            if (message.isEndSession()) {
+                for (SignalServiceAddress recipient : recipientsTS) {
+                    handleEndSession(recipient.getNumber());
+                }
             }
+        } finally {
+            save();
         }
-        save();
     }
 
     private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) {