use java7's nio api to get more detailed error messages

[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 8de14b2d3efd4fbfb9c66e5a19fbdaa7225a0a2d..d329990dda87ed42ee6644962a8ea650f8bc95d9 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -1325,8 +1325,11 @@ class Manager implements Signal {
                 output.close();
             }
             input.close();
-            if (!tmpFile.delete()) {
-                System.err.println("Failed to delete temp file: " + tmpFile);
+            try {
+                Files.delete(tmpFile.toPath());
+            } catch(Exception e) {
+                System.out.println("Failed to delete temp file: " + tmpFile);
+                e.printStackTrace();
             }
         }
         return outputFile;
@@ -1372,13 +1375,17 @@ class Manager implements Signal {
 
             if (groupsFile.exists() && groupsFile.length() > 0) {
                 FileInputStream contactsFileStream = new FileInputStream(groupsFile);
-                SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
-                        .withStream(contactsFileStream)
-                        .withContentType("application/octet-stream")
-                        .withLength(groupsFile.length())
-                        .build();
-
-                sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
+                try {
+                    SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
+                            .withStream(contactsFileStream)
+                            .withContentType("application/octet-stream")
+                            .withLength(groupsFile.length())
+                            .build();
+
+                    sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
+                } finally {
+                    contactsFileStream.close();
+                }
             }
         } finally {
             groupsFile.delete();