From: AsamK <asamk@gmx.de>
Date: Sun, 19 Jun 2016 13:08:49 +0000 (+0200)
Subject: Remove dependency on apache commons-io
X-Git-Tag: v0.4.0~7
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/4608fb433b1af1753bdf73584d5c0f5f9e70f1bf?ds=inline

Remove dependency on apache commons-io
---

diff --git a/build.gradle b/build.gradle
index 5bd59f55..b38e4d47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,6 @@ repositories {
 dependencies {
     compile 'org.whispersystems:signal-service-java:2.1.1fetchMessages_provisioning'
     compile 'org.bouncycastle:bcprov-jdk15on:1.54'
-    compile 'commons-io:commons-io:2.5'
     compile 'net.sourceforge.argparse4j:argparse4j:0.7.0'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'
 }
diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index b3664f24..4b22605c 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -19,7 +19,6 @@ package org.asamk.signal;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
-import org.apache.commons.io.IOUtils;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;
 import org.freedesktop.dbus.DBusConnection;
@@ -41,8 +40,11 @@ import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.Charset;
 import java.security.Security;
 import java.util.ArrayList;
 import java.util.List;
@@ -270,7 +272,7 @@ public class Main {
                         String messageText = ns.getString("message");
                         if (messageText == null) {
                             try {
-                                messageText = IOUtils.toString(System.in);
+                                messageText = readAll(System.in);
                             } catch (IOException e) {
                                 System.err.println("Failed to read message from stdin: " + e.getMessage());
                                 System.err.println("Aborting sending.");
@@ -643,6 +645,18 @@ public class Main {
         System.err.println("Failed to send message: " + e.getMessage());
     }
 
+    private static String readAll(InputStream in) throws IOException {
+        StringWriter output = new StringWriter();
+        byte[] buffer = new byte[4096];
+        long count = 0;
+        int n;
+        while (-1 != (n = System.in.read(buffer))) {
+            output.write(new String(buffer, 0, n, Charset.defaultCharset()));
+            count += n;
+        }
+        return output.toString();
+    }
+
     private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         final Manager m;