From 7477de83e9a58ca68d6ffbfabc5ba474d7e6d0bd Mon Sep 17 00:00:00 2001
From: Severin Rudie <srudie@mozilla.com>
Date: Mon, 9 Dec 2019 10:46:24 -0800
Subject: [PATCH] For #4844: fix file prefix url shortening

---
 app/src/main/java/org/mozilla/fenix/ext/String.kt     | 7 +------
 app/src/test/java/org/mozilla/fenix/ext/StringTest.kt | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/String.kt b/app/src/main/java/org/mozilla/fenix/ext/String.kt
index 304290303..e43e589ab 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/String.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/String.kt
@@ -40,17 +40,12 @@ fun String.toShortUrl(publicSuffixList: PublicSuffixList): String {
     if (
         inputString.isEmpty() ||
         !URLUtil.isValidUrl(inputString) ||
-        inputString == FILE_PREFIX ||
+        inputString.startsWith(FILE_PREFIX) ||
         uri.port !in -1..MAX_VALID_PORT
     ) {
         return inputString
     }
 
-    if (inputString.startsWith(FILE_PREFIX)) {
-        // Strip file prefix and return the remainder
-        return inputString.substring(FILE_PREFIX.length)
-    }
-
     if (uri.host?.isIpv4() == true ||
         uri.isIpv6() ||
         // If inputString is just a hostname and not a FQDN, use the entire hostname.
diff --git a/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt b/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt
index f090416c9..d370c3e44 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt
@@ -186,8 +186,8 @@ class StringTest {
     }
 
     @Test
-    fun `should return not the protocol for file`() {
-        "file:///foo/bar.txt" shortenedShouldBecome "/foo/bar.txt"
+    fun `file uri should return input`() {
+        "file:///foo/bar.txt" shortenedShouldBecome "file:///foo/bar.txt"
     }
 
     @Test