From 4467368c8c9f08da589b2b8acdeea96b49048011 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 15 Feb 2018 19:12:57 +0100
Subject: =?UTF-8?q?always=20copy=20firefoxe=E2=80=99s=20shared=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/pixart/messenger/persistance/FileBackend.java     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/persistance/FileBackend.java')

diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index 044cc0188..9bf826fe1 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -47,6 +47,7 @@ import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -75,6 +76,10 @@ public class FileBackend {
 
     private XmppConnectionService mXmppConnectionService;
 
+    private static final List<String> BLACKLISTED_PATH_ELEMENTS = Arrays.asList(
+            "org.mozilla.firefox"
+    );
+
     public FileBackend(XmppConnectionService service) {
         this.mXmppConnectionService = service;
     }
@@ -265,7 +270,7 @@ public class FileBackend {
 
     public boolean useImageAsIs(Uri uri) {
         String path = getOriginalPath(uri);
-        if (path == null) {
+        if (path == null || isPathBlacklisted(path)) {
             return false;
         }
         File file = new File(path);
@@ -300,6 +305,15 @@ public class FileBackend {
         return false;
     }
 
+    public static boolean isPathBlacklisted(String path) {
+        for (String element : BLACKLISTED_PATH_ELEMENTS) {
+            if (path.contains(element)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public String getOriginalPath(Uri uri) {
         return FileUtils.getPath(mXmppConnectionService, uri);
     }
-- 
cgit v1.2.3