URL encoded scrubber.

* Replace scrubber and tests.

* Improves email regex performance.

test/unitTest/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java

@@ -0,0 +1,86 @@
+package org.thoughtcrime.securesms.logsubmit.util;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public final class ScrubberTest {
+
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][]{
+
+    { "An E164 number +15551234567",
+      "An E164 number +*********67" },
+
+    { "A UK number +447700900000",
+      "A UK number +**********00" },
+
+    { "An avatar filename: file:///data/user/0/org.thoughtcrime.securesms/files/avatars/%2B447700900099",
+      "An avatar filename: file:///data/user/0/org.thoughtcrime.securesms/files/avatars/%2B**********99" },
+
+    { "Multiple numbers +447700900001 +447700900002",
+      "Multiple numbers +**********01 +**********02" },
+
+    { "One less than shortest number +155556789",
+      "One less than shortest number +155556789" },
+
+    { "Shortest number +1555567890",
+      "Shortest number +********90" },
+
+    { "Longest number +155556789012345",
+      "Longest number +*************45" },
+
+    { "One more than longest number +1234567890123456",
+      "One more than longest number +*************456" },
+
+    { "abc@def.com",
+      "a...@..." },
+
+    { "An email abc@def.com",
+      "An email a...@..." },
+
+    { "A short email a@def.com",
+      "A short email a...@..." },
+
+    { "A email with multiple parts before the @ d.c+b.a@mulitpart.domain.com and a multipart domain",
+      "A email with multiple parts before the @ d...@... and a multipart domain" },
+
+    { "An avatar email filename: file:///data/user/0/org.thoughtcrime.securesms/files/avatars/abc@signal.org",
+      "An avatar email filename: file:///data/user/0/org.thoughtcrime.securesms/files/avatars/a...@..." },
+
+    { "An email and a number abc@def.com +155556789012345",
+      "An email and a number a...@... +*************45" },
+
+    { "__textsecure_group__!abcdefg1234567890",
+      "__...group...90" },
+
+    { "A group id __textsecure_group__!abcdefg0987654321 surrounded with text",
+      "A group id __...group...21 surrounded with text" },
+
+    { "All patterns in a row __textsecure_group__!abcdefg1234567890 +1234567890123456 abc@def.com with text after",
+      "All patterns in a row __...group...90 +*************456 a...@... with text after"
+    }
+
+    });
+  }
+
+  private final String input;
+  private final String expected;
+
+  public ScrubberTest(String input, String expected) {
+    this.input    = input;
+    this.expected = expected;
+  }
+
+  @Test
+  public void scrub() {
+    assertEquals(expected, Scrubber.scrub(input).toString());
+  }
+}