Refactor Manager and SignalAccount to implement Closeable

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

diff --git a/src/main/java/org/asamk/signal/util/IOUtils.java b/src/main/java/org/asamk/signal/util/IOUtils.java
index 69128d015534eeabb29b33704b9ee7029f326581..f21c1572b57334735b483cba7d827c377483d8d1 100644 (file)
--- a/src/main/java/org/asamk/signal/util/IOUtils.java
+++ b/src/main/java/org/asamk/signal/util/IOUtils.java
@@ -1,5 +1,8 @@
 package org.asamk.signal.util;
 
 package org.asamk.signal.util;
 

+import org.whispersystems.signalservice.internal.util.Util;
+
+import java.io.ByteArrayOutputStream;

 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;


@@ -12,7 +15,9 @@ import java.nio.file.attribute.PosixFilePermissions;
 import java.util.EnumSet;
 import java.util.Set;
 
 import java.util.EnumSet;
 import java.util.Set;
 

-import static java.nio.file.attribute.PosixFilePermission.*;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;

 
 public class IOUtils {
 
 
 public class IOUtils {
 


@@ -33,13 +38,24 @@ public class IOUtils {
         return output.toString();
     }
 
         return output.toString();
     }
 

-    public static void createPrivateDirectories(String path) throws IOException {
-        final Path file = new File(path).toPath();
+    public static byte[] readFully(InputStream in) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        Util.copy(in, baos);
+        return baos.toByteArray();
+    }
+
+    public static void createPrivateDirectories(String directoryPath) throws IOException {
+        final File file = new File(directoryPath);
+        if (file.exists()) {
+            return;
+        }
+
+        final Path path = file.toPath();

         try {
             Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE);
         try {
             Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE);

-            Files.createDirectories(file, PosixFilePermissions.asFileAttribute(perms));
+            Files.createDirectories(path, PosixFilePermissions.asFileAttribute(perms));

         } catch (UnsupportedOperationException e) {
         } catch (UnsupportedOperationException e) {

-            Files.createDirectories(file);
+            Files.createDirectories(path);

         }
     }
 
         }
     }
 


@@ -52,4 +68,13 @@ public class IOUtils {
             Files.createFile(file);
         }
     }
             Files.createFile(file);
         }
     }

+
+    public static String getDataHomeDir() {
+        String dataHome = System.getenv("XDG_DATA_HOME");
+        if (dataHome != null) {
+            return dataHome;
+        }
+
+        return System.getProperty("user.home") + "/.local/share";
+    }

 }
 }