fix first upload

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -764,18 +764,22 @@ private RemoteOperationResult performE2EUpload(E2EClientData data) throws Operat
         return result;
     }
 
-    private E2EData getE2EData(Object object) throws InvalidAlgorithmParameterException, NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, InvalidParameterSpecException, IOException {
+    private E2EData getE2EData(Object object) throws InvalidAlgorithmParameterException, IllegalStateException, NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, InvalidParameterSpecException, IOException {
         byte[] key = EncryptionUtils.generateKey();
         byte[] iv = EncryptionUtils.randomBytes(EncryptionUtils.ivLength);
         Cipher cipher = EncryptionUtils.getCipher(Cipher.ENCRYPT_MODE, key, iv);
-        File file = new File(mFile.getStoragePath());
-        EncryptedFile encryptedFile = EncryptionUtils.encryptFile(user.getAccountName(), file, cipher);
+        File originalFile = new File(mFile.getStoragePath());
+        EncryptedFile encryptedFile = EncryptionUtils.encryptFile(user.getAccountName(), originalFile, cipher);
         String encryptedFileName = getEncryptedFileName(object);
 
         if (key == null) {
             throw new NullPointerException("key cannot be null");
         }
 
+        if (originalFile.getAbsolutePath().equals(encryptedFile.getEncryptedFile().getAbsolutePath())) {
+            throw new IllegalStateException("The encrypted file path cannot be the same as the original file path.");
+        }
+
         return new E2EData(key, iv, encryptedFile, encryptedFileName);
     }
 

app/src/main/java/com/owncloud/android/operations/e2e/E2EFiles.kt

@@ -21,12 +21,22 @@ data class E2EFiles(
     private val tag = "E2EFiles"
 
     fun deleteTemporalFile() {
+        if (temporalFile == null) {
+            Log_OC.d(tag, "Could not delete temporal file, temporal file is null")
+            return
+        }
+
         if (temporalFile?.exists() == true && temporalFile?.delete() == false) {
             Log_OC.e(tag, "Could not delete temporal file " + temporalFile?.absolutePath)
         }
     }
 
     fun deleteTemporalFileWithOriginalFileComparison() {
+        if (temporalFile == null) {
+            Log_OC.d(tag, "Could not delete temporal file, temporal file is null")
+            return
+        }
+
         if (originalFile == temporalFile) {
             return
         }
@@ -38,9 +48,9 @@ data class E2EFiles(
     fun deleteEncryptedTempFile() {
         if (encryptedTempFile != null) {
             val isTempEncryptedFileDeleted = encryptedTempFile?.delete()
-            Log_OC.e(tag, "isTempEncryptedFileDeleted: $isTempEncryptedFileDeleted")
+            Log_OC.d(tag, "isTempEncryptedFileDeleted: $isTempEncryptedFileDeleted")
         } else {
-            Log_OC.e(tag, "Encrypted temp file cannot be found")
+            Log_OC.d(tag, "Encrypted temp file cannot be found")
         }
     }
 }

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

@@ -546,10 +546,12 @@ public static byte[] decodeStringToBase64Bytes(String string) {
     }
 
     public static EncryptedFile encryptFile(String accountName, File file, Cipher cipher) throws InvalidParameterSpecException, IOException {
-        File tempEncryptedFolder = FileDataStorageManager.createTempEncryptedFolder(accountName);
-        File tempEncryptedFile = File.createTempFile(file.getName(), null, tempEncryptedFolder);
+        final File tempEncryptedFolder = FileDataStorageManager.createTempEncryptedFolder(accountName);
+        final String randomFileName = UUID.randomUUID().toString();
+        final String suffix = String.valueOf(System.currentTimeMillis());
+        final File tempEncryptedFile = File.createTempFile(randomFileName, suffix, tempEncryptedFolder);
         encryptFileWithGivenCipher(file, tempEncryptedFile, cipher);
-        String authenticationTagString = getAuthenticationTag(cipher);
+        final String authenticationTagString = getAuthenticationTag(cipher);
         return new EncryptedFile(tempEncryptedFile, authenticationTagString);
     }