Merge pull request nextcloud#15802 from nextcloud/backport/15799/stable-3.34

[stable-3.34] fix: incomplete trailing space during decoding filename

Author: alperozturk96

app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -80,8 +80,8 @@ public static boolean containsBidiControlCharacters(String filename) {
         String decoded;
         try {
             decoded = URLDecoder.decode(filename, StandardCharsets.UTF_8.toString());
-        } catch (UnsupportedEncodingException e) {
-            return false;
+        } catch (Exception e) {
+            decoded = filename;
         }
 
         int[] bidiControlCharacters = {

app/src/test/java/com/nextcloud/client/utils/FileStorageUtilsTest.kt

@@ -304,4 +304,22 @@ class FileStorageUtilsTest {
         val result = FileStorageUtils.containsBidiControlCharacters("/Foo%e2%80%aedm.exe")
         assertTrue(result)
     }
+
+    @Test
+    fun testContainsBidiControlCharactersWhenGivenMalformedEncodedSequenceShouldNotThrowAndReturnFalse() {
+        val result = FileStorageUtils.containsBidiControlCharacters("file%")
+        assertFalse(result)
+    }
+
+    @Test
+    fun testContainsBidiControlCharactersWhenGivenBrokenUrlEncodedPatternShouldHandleGracefully() {
+        val result = FileStorageUtils.containsBidiControlCharacters("file%2")
+        assertFalse(result)
+    }
+
+    @Test
+    fun testContainsBidiControlCharactersWhenGivenMultipleBidiCharactersShouldReturnTrue() {
+        val result = FileStorageUtils.containsBidiControlCharacters("safe\u202Ebad\u202Bname.txt")
+        assertTrue(result)
+    }
 }