From 110a40592bc539bb739db97d48297bddcdac274c Mon Sep 17 00:00:00 2001
From: Oscar Mira <valldrac@protonmail.ch>
Date: Wed, 7 Aug 2019 15:31:08 +0200
Subject: [PATCH] Make E164 log scrubber redact numbers of length >= 7.

---
 .../thoughtcrime/securesms/logsubmit/util/Scrubber.java   | 3 ++-
 .../securesms/logsubmit/util/ScrubberTest.java            | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java b/src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java
index 5b8893ea21..d0daf8848f 100644
--- a/src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java
+++ b/src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java
@@ -32,9 +32,10 @@ public final class Scrubber {
 
   /**
    * The middle group will be censored.
+   * Supposedly, the shortest international phone numbers in use contain seven digits.
    * Handles URL encoded +, %2B
    */
-  private static final Pattern E164_PATTERN = Pattern.compile("(\\+|%2B)(\\d{8,13})(\\d{2})");
+  private static final Pattern E164_PATTERN = Pattern.compile("(\\+|%2B)(\\d{5,13})(\\d{2})");
   private static final String  E164_CENSOR  = "*************";
 
   /**
diff --git a/test/unitTest/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java b/test/unitTest/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java
index a8ad046f24..70eec72203 100644
--- a/test/unitTest/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java
+++ b/test/unitTest/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java
@@ -28,11 +28,11 @@ public final class ScrubberTest {
     { "Multiple numbers +447700900001 +447700900002",
       "Multiple numbers +**********01 +**********02" },
 
-    { "One less than shortest number +155556789",
-      "One less than shortest number +155556789" },
+    { "One less than shortest number +155556",
+      "One less than shortest number +155556" },
 
-    { "Shortest number +1555567890",
-      "Shortest number +********90" },
+    { "Shortest number +1555567",
+      "Shortest number +*****67" },
 
     { "Longest number +155556789012345",
       "Longest number +*************45" },