fix: left to right filename sanitization

app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt

@@ -231,6 +231,13 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
                         sut.storageManager.saveFile(this)
                     }
 
+                    OCFile("/Foo%e2%80%aedm.exe").apply {
+                        remoteId = "000000011"
+                        parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
+                        modificationTimestamp = 1000
+                        sut.storageManager.saveFile(this)
+                    }
+
                     sut.addFragment(fragment)
                     val root = sut.storageManager.getFileByEncryptedRemotePath("/")
                     fragment.listDirectory(root, false, false)

app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt

@@ -33,6 +33,7 @@ import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.account.CurrentAccountProvider
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.di.ViewModelFactory
+import com.nextcloud.utils.extensions.setVisibleIf
 import com.owncloud.android.R
 import com.owncloud.android.databinding.FileActionsBottomSheetBinding
 import com.owncloud.android.databinding.FileActionsBottomSheetItemBinding
@@ -44,6 +45,7 @@ import com.owncloud.android.lib.resources.files.model.FileLockType
 import com.owncloud.android.ui.activity.ComponentsGetter
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.DisplayUtils.AvatarGenerationListener
+import com.owncloud.android.utils.FileStorageUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import javax.inject.Inject
 
@@ -204,11 +206,23 @@ class FileActionsBottomSheet :
     private fun displayTitle(titleFile: OCFile?) {
         val decryptedFileName = titleFile?.decryptedFileName
         if (decryptedFileName != null) {
-            decryptedFileName.let {
-                binding.title.text = it
+            val isFolder = titleFile.isFolder
+            val isRTL = DisplayUtils.isRTL()
+            val (base, ext) = FileStorageUtils.getFilenameAndExtension(decryptedFileName, isFolder, isRTL)
+            val titleMaxWidth = DisplayUtils.convertDpToPixel(
+                requireContext().resources.configuration.screenWidthDp.times(FILENAME_MAX_WIDTH_PERCENTAGE).toFloat(),
+                context
+            )
+
+            binding.title.maxWidth = titleMaxWidth
+            binding.title.text = base
+            binding.extension.setVisibleIf(!isFolder)
+            if (!isFolder) {
+                binding.extension.text = ext
             }
         } else {
             binding.title.isVisible = false
+            binding.extension.isVisible = false
         }
     }
 
@@ -300,6 +314,7 @@ class FileActionsBottomSheet :
     companion object {
         private const val REQUEST_KEY = "REQUEST_KEY_ACTION"
         private const val RESULT_KEY_ACTION_ID = "RESULT_KEY_ACTION_ID"
+        private const val FILENAME_MAX_WIDTH_PERCENTAGE = 0.6
 
         @JvmStatic
         @JvmOverloads

app/src/main/java/com/owncloud/android/ui/adapter/GroupfolderListAdapter.kt

@@ -53,6 +53,7 @@ class GroupfolderListAdapter(
         listHolder.apply {
             fileName.text = file.name
             fileSize.text = file.parentFile?.path ?: "/"
+            extension.visibility = View.GONE
             fileSizeSeparator.visibility = View.GONE
             lastModification.visibility = View.GONE
             checkbox.visibility = View.GONE

app/src/main/java/com/owncloud/android/ui/adapter/ListGridItemViewHolder.kt

@@ -11,4 +11,5 @@ import android.widget.TextView
 
 internal interface ListGridItemViewHolder : ListViewHolder {
     val fileName: TextView
+    val extension: TextView?
 }

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -102,6 +102,7 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import kotlin.Pair;
 import me.zhanghai.android.fastscroll.PopupTextProvider;
 
 /**
@@ -123,6 +124,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private FileDataStorageManager mStorageManager;
     private User user;
     private final OCFileListFragmentInterface ocFileListFragmentInterface;
+    private final boolean isRTL;
 
     private OCFile currentDirectory;
     private static final String TAG = OCFileListAdapter.class.getSimpleName();
@@ -195,6 +197,7 @@ public OCFileListAdapter(
 
         // initialise thumbnails cache on background thread
         ThumbnailsCacheManager.initDiskCacheAsync();
+        isRTL = DisplayUtils.isRTL();
     }
 
     public boolean isMultiSelect() {
@@ -476,7 +479,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             }
 
             if (holder instanceof ListGridItemViewHolder gridItemViewHolder) {
-                bindListGridItemViewHolder(gridItemViewHolder, file);
+                setFilenameAndExtension(gridItemViewHolder, file);
                 checkVisibilityOfFileFeaturesLayout(gridItemViewHolder);
             }
 
@@ -556,8 +559,53 @@ private void updateLivePhotoIndicators(ListViewHolder holder, OCFile file) {
         }
     }
 
-    private void bindListGridItemViewHolder(ListGridItemViewHolder holder, OCFile file) {
-        holder.getFileName().setText(mStorageManager.getFilenameConsideringOfflineOperation(file));
+    private void setFilenameAndExtension(ListGridItemViewHolder holder, OCFile file) {
+        final String filename = mStorageManager.getFilenameConsideringOfflineOperation(file);
+        final var pair = FileStorageUtils.getFilenameAndExtension(filename, file.isFolder(), isRTL);
+        final boolean isFolder = file.isFolder();
+
+        if (holder instanceof OCFileListGridItemViewHolder gridItemViewHolder) {
+            handleGridMode(filename, gridItemViewHolder, pair, file);
+        } else {
+            handleListMode(holder, pair, isFolder);
+        }
+    }
+
+    private void handleGridMode(String filename, OCFileListGridItemViewHolder holder, Pair<String, String> filenamePair, OCFile file) {
+        boolean containsBidiControlCharacters = FileStorageUtils.containsBidiControlCharacters(filename);
+        ViewExtensionsKt.setVisibleIf(holder.getFileName(),!containsBidiControlCharacters);
+        ViewExtensionsKt.setVisibleIf(holder.getBinding().bidiFilenameContainer, containsBidiControlCharacters);
+        final var extension = holder.getExtension();
+
+        if (containsBidiControlCharacters) {
+            holder.getBidiFilename().setText(filenamePair.getFirst());
+            if (extension != null) {
+                extension.setText(filenamePair.getSecond());
+            }
+            holder.getBinding().more.setVisibility(View.GONE);
+            holder.getBinding().bidiMore.setOnClickListener(v -> ocFileListFragmentInterface.onOverflowIconClicked(file, v));
+        } else {
+            holder.getFileName().setText(filename);
+            if (extension != null) {
+                extension.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    private void handleListMode(ListGridItemViewHolder holder,
+                                Pair<String, String> filenamePair,
+                                boolean isFolder) {
+        holder.getFileName().setText(filenamePair.getFirst());
+
+        final var extension = holder.getExtension();
+        if (extension != null) {
+            if (isFolder) {
+                extension.setVisibility(View.GONE);
+            } else {
+                extension.setVisibility(View.VISIBLE);
+                extension.setText(filenamePair.getSecond());
+            }
+        }
     }
 
     private void bindListItemViewHolder(ListItemViewHolder holder, OCFile file) {
@@ -1145,6 +1193,10 @@ public void cancelAllPendingTasks() {
         ocFileListDelegate.cancelAllPendingTasks();
     }
 
+    public boolean isGridView() {
+        return gridView;
+    }
+
     public void setGridView(boolean bool) {
         gridView = bool;
     }

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListGridItemViewHolder.kt

@@ -12,17 +12,26 @@ import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.elyeproj.loaderviewlibrary.LoaderImageView
 import com.owncloud.android.databinding.GridItemBinding
 
-internal class OCFileListGridItemViewHolder(var binding: GridItemBinding) :
+class OCFileListGridItemViewHolder(var binding: GridItemBinding) :
     RecyclerView.ViewHolder(
         binding.root
     ),
     ListGridItemViewHolder {
+    val bidiFilename: TextView
+        get() = binding.bidiFilename
     override val fileName: TextView
         get() = binding.Filename
+    override val extension: TextView?
+        get() = if (binding.bidiFilenameContainer.isVisible) {
+            binding.bidiExtension
+        } else {
+            null
+        }
     override val thumbnail: ImageView
         get() = binding.thumbnail
 
@@ -56,8 +65,11 @@ internal class OCFileListGridItemViewHolder(var binding: GridItemBinding) :
     override val fileFeaturesLayout: LinearLayout
         get() = binding.fileFeaturesLayout
     override val more: ImageButton
-        get() = binding.more
-
+        get() = if (binding.bidiFilenameContainer.isVisible) {
+            binding.bidiMore
+        } else {
+            binding.more
+        }
     init {
         binding.favoriteAction.drawable.mutate()
     }

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListItemViewHolder.kt

@@ -43,6 +43,8 @@ internal class OCFileListItemViewHolder(private var binding: ListItemBinding) :
         get() = binding.sharedAvatars
     override val fileName: TextView
         get() = binding.Filename
+    override val extension: TextView
+        get() = binding.extension
     override val thumbnail: ImageView
         get() = binding.thumbnailLayout.thumbnail
     override val tagsGroup: ChipGroup

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListViewHolder.kt

@@ -12,6 +12,7 @@ import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.elyeproj.loaderviewlibrary.LoaderImageView
 import com.owncloud.android.databinding.GridItemBinding
@@ -26,7 +27,11 @@ internal class OCFileListViewHolder(var binding: GridItemBinding) :
         get() = binding.thumbnail
 
     override val imageFileName: TextView
-        get() = binding.Filename
+        get() = if (binding.bidiFilenameContainer.isVisible) {
+            binding.bidiFilename
+        } else {
+            binding.Filename
+        }
 
     override fun showVideoOverlay() {
         // noop
@@ -47,7 +52,11 @@ internal class OCFileListViewHolder(var binding: GridItemBinding) :
     override val unreadComments: ImageView
         get() = binding.unreadComments
     override val more: ImageButton
-        get() = binding.more
+        get() = if (binding.bidiFilenameContainer.isVisible) {
+            binding.bidiMore
+        } else {
+            binding.more
+        }
     override val fileFeaturesLayout: LinearLayout
         get() = binding.fileFeaturesLayout
     override val gridLivePhotoIndicator: ImageView

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

@@ -26,6 +26,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -685,6 +686,14 @@ public static float convertPixelToDp(int px, Context context) {
         return px * (DisplayMetrics.DENSITY_DEFAULT / (float) metrics.densityDpi);
     }
 
+    public static boolean isRTL() {
+        return TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL;
+    }
+
+    public static boolean isOrientationLandscape() {
+        return MainApp.getAppContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
+    }
+
     static public void showServerOutdatedSnackbar(Activity activity, int length) {
         Snackbar.make(activity.findViewById(android.R.id.content),
                       R.string.outdated_server, length)

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

@@ -27,15 +27,19 @@
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.files.model.RemoteFile;
-import com.owncloud.android.lib.resources.shares.ShareeUser;
 import com.owncloud.android.ui.helpers.FileOperationsHelper;
 
+import org.apache.commons.io.FilenameUtils;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -53,6 +57,7 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.core.app.ActivityCompat;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import kotlin.Pair;
 
 /**
  * Static methods to help in access to local file system.
@@ -69,6 +74,56 @@ private FileStorageUtils() {
         // utility class -> private constructor
     }
 
+    public static boolean containsBidiControlCharacters(String filename) {
+        if (filename == null) return false;
+
+        String decoded;
+        try {
+            decoded = URLDecoder.decode(filename, StandardCharsets.UTF_8.toString());
+        } catch (UnsupportedEncodingException e) {
+            return false;
+        }
+
+        int[] bidiControlCharacters = {
+            0x202A, 0x202B, 0x202C, 0x202D, 0x202E,
+            0x200E, 0x200F, 0x2066, 0x2067, 0x2068,
+            0x2069, 0x061C
+        };
+
+        for (int i = 0; i < decoded.length(); i++) {
+            int codePoint = decoded.codePointAt(i);
+            for (int chars : bidiControlCharacters) {
+                if (codePoint == chars) {
+                    return true;
+                }
+            }
+        }
+
+        for (char c : decoded.toCharArray()) {
+            if (c < 32) return true;
+        }
+
+        return false;
+    }
+
+    public static Pair<String,String> getFilenameAndExtension(String filename, boolean isFolder, boolean isRTL) {
+        if (isFolder) {
+            return new Pair<>(filename, "");
+        }
+
+        final String base =  FilenameUtils.getBaseName(filename);
+        String extension =  FilenameUtils.getExtension(filename);
+        if (!extension.isEmpty()) {
+            extension =  StringConstants.DOT + extension;
+        }
+
+        if (isRTL) {
+            return new Pair<>(extension, base);
+        } else {
+            return new Pair<>(base, extension);
+        }
+    }
+
     public static boolean isValidExtFilename(String name) {
         for (int i = 0; i < name.length(); i++) {
             char c = name.charAt(i);