wip

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -46,7 +46,6 @@
 
 public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterface {
 
-    public final static long FIRST_E2EE_COUNTER = 1L;
     public final static String PERMISSION_CAN_RESHARE = "R";
     public final static String PERMISSION_SHARED = "S";
     public final static String PERMISSION_MOUNTED = "M";
@@ -1176,12 +1175,4 @@ public boolean hasValidParentId() {
             return getParentId() != 0;
         }
     }
-
-    public static long getFirstE2EECounter(boolean useV2) {
-        if (useV2) {
-            return 1L;
-        } else {
-            return 0L;
-        }
-    }
 }

app/src/main/java/com/owncloud/android/datamodel/e2e/v2/decrypted/DecryptedMetadata.kt

@@ -7,13 +7,12 @@
  */
 package com.owncloud.android.datamodel.e2e.v2.decrypted
 
-import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.utils.EncryptionUtils
 
 data class DecryptedMetadata(
     val keyChecksums: MutableList<String> = mutableListOf(),
     val deleted: Boolean = false,
-    var counter: Long = OCFile.getFirstE2EECounter(true),
+    var counter: Long = EncryptionUtils.E2E_V2_INITIAL_COUNTER,
     val folders: MutableMap<String, String> = mutableMapOf(),
     val files: MutableMap<String, DecryptedFile> = mutableMapOf(),
     @Transient

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

@@ -137,7 +137,7 @@ private RemoteOperationResult encryptedCreateV1(OCFile parent, OwnCloudClient cl
 
         try {
             // lock folder
-            token = EncryptionUtils.lockFolder(parent, client, OCFile.getFirstE2EECounter(false));
+            token = EncryptionUtils.lockFolder(parent, client, EncryptionUtils.E2E_V1_INITIAL_COUNTER);
 
             // get metadata
             Pair<Boolean, DecryptedFolderMetadataFileV1> metadataPair = EncryptionUtils.retrieveMetadataV1(parent,
@@ -153,7 +153,7 @@ private RemoteOperationResult encryptedCreateV1(OCFile parent, OwnCloudClient cl
 
             // check if filename already exists
             if (isFileExisting(metadata, filename)) {
-                return new RemoteOperationResult(RemoteOperationResult.ResultCode.FOLDER_ALREADY_EXISTS);
+                return new RemoteOperationResult<>(RemoteOperationResult.ResultCode.FOLDER_ALREADY_EXISTS);
             }
 
             // generate new random file name, check if it exists in metadata
@@ -275,7 +275,7 @@ private RemoteOperationResult encryptedCreateV2(OCFile parent, OwnCloudClient cl
 
         try {
             // lock folder
-            token = EncryptionUtils.lockFolder(parent, client, OCFile.getFirstE2EECounter(true));
+            token = EncryptionUtils.lockFolder(parent, client, EncryptionUtils.E2E_V2_INITIAL_COUNTER);
 
             // get metadata
             EncryptionUtilsV2 encryptionUtilsV2 = new EncryptionUtilsV2();

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

@@ -64,6 +64,7 @@
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface;
 import com.owncloud.android.ui.preview.PreviewTextFragment;
 import com.owncloud.android.utils.DisplayUtils;
+import com.owncloud.android.utils.EncryptionUtils;
 import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
@@ -298,7 +299,12 @@ public void updateFileEncryptionById(String fileId, boolean encrypted) {
             .ifPresent(file -> {
                 file.setEncrypted(encrypted);
                 final var isE2EEV2 = E2EVersionHelper.INSTANCE.isV2Plus(capability);
-                file.setE2eCounter(OCFile.getFirstE2EECounter(isE2EEV2));
+                long e2eCounter = EncryptionUtils.E2E_V1_INITIAL_COUNTER;
+                if (isE2EEV2) {
+                    e2eCounter = EncryptionUtils.E2E_V2_INITIAL_COUNTER;
+                }
+
+                file.setE2eCounter(e2eCounter);
                 mStorageManager.saveFile(file);
                 int position = getItemPosition(file);
                 if (position != -1) {

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1946,9 +1946,13 @@ private void encryptFolder(OCFile folder,
             if (remoteOperationResult.isSuccess()) {
                 OCCapability ocCapability = mContainerActivity.getStorageManager().getCapability(user.getAccountName());
                 final var isE2EEV2 = E2EVersionHelper.INSTANCE.isV2Plus(ocCapability);
+                long e2eCounter = EncryptionUtils.E2E_V1_INITIAL_COUNTER;
+                if (isE2EEV2) {
+                    e2eCounter = EncryptionUtils.E2E_V2_INITIAL_COUNTER;
+                }
 
                 // lock folder
-                String token = EncryptionUtils.lockFolder(folder, client, OCFile.getFirstE2EECounter(isE2EEV2));
+                String token = EncryptionUtils.lockFolder(folder, client, e2eCounter);
 
                 if (E2EVersionHelper.INSTANCE.isV2Plus(ocCapability)) {
                     // Update metadata

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

@@ -129,6 +129,10 @@ public final class EncryptionUtils {
     @VisibleForTesting
     public static final String MIGRATED_FOLDER_IDS = "MIGRATED_FOLDER_IDS";
 
+    public static final long E2E_V1_INITIAL_COUNTER = 0L;
+    public static final long E2E_V2_INITIAL_COUNTER = 1L;
+
+
     private EncryptionUtils() {
         // utility class -> private constructor
     }