From df84927954e0697b290d1225d18250967d51477f Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Wed, 1 Aug 2018 19:33:02 +0200
Subject: [PATCH] Fix filename generation and add testcasce

Fixes #1169
---
 .../gadgetbridge/util/FileUtils.java          |  2 +-
 .../gadgetbridge/test/FileUtilsTest.java      | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/FileUtilsTest.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
index 9ec1ad2da..6500a5b43 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
@@ -318,6 +318,6 @@ public class FileUtils {
      * @return the valid file name
      */
     public static String makeValidFileName(String name) {
-        return name.replaceAll("\0/:\\r\\n\\\\", "_");
+        return name.replaceAll("[\0/:\\r\\n\\\\]", "_");
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/FileUtilsTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/FileUtilsTest.java
new file mode 100644
index 000000000..a715a958f
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/FileUtilsTest.java
@@ -0,0 +1,19 @@
+package nodomain.freeyourgadget.gadgetbridge.test;
+
+import org.junit.Test;
+
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
+
+import static org.junit.Assert.assertEquals;
+
+public class FileUtilsTest extends TestBase {
+
+    @Test
+    public void testValidFileName() {
+        String tempName = "foo:bar";
+        assertEquals("foo_bar", FileUtils.makeValidFileName(tempName));
+
+        tempName = "fo\no::bar";
+        assertEquals("fo_o__bar", FileUtils.makeValidFileName(tempName));
+    }
+}