Merge pull request #14707 from nextcloud/backport/14640/stable-3.31

[stable-3.31] BugFix - E2EE Rename NameCollision

Author: tobiasKaminsky

Diff for: app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -756,7 +756,8 @@ private void updateMetadataForE2E(Object object, E2EData e2eData, E2EClientData
         throws InvalidAlgorithmParameterException, UploadException, NoSuchPaddingException, IllegalBlockSizeException, CertificateException,
         NoSuchAlgorithmException, BadPaddingException, InvalidKeyException {
 
-        mFile.setDecryptedRemotePath(e2eFiles.getParentFile().getDecryptedRemotePath() + e2eFiles.getOriginalFile().getName());
+        final var filename = new File(mFile.getRemotePath()).getName();
+        mFile.setDecryptedRemotePath(e2eFiles.getParentFile().getDecryptedRemotePath() + filename);
         mFile.setRemotePath(e2eFiles.getParentFile().getRemotePath() + e2eData.getEncryptedFileName());