wip

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

Author: alperozturk96

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

@@ -526,7 +526,8 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare
                 return result;
             }
 
-            long counter = e2eeCounterFetchOperation.resolveE2EECounter(parentFile, getStorageManager(), mContext);
+            long lastCounter = e2eeCounterFetchOperation.fetch(mContext, parentFile, getStorageManager(), user, client);
+            long counter = lastCounter + 1;
 
             try {
                 token = getFolderUnlockTokenOrLockFolder(client, parentFile, counter);

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

@@ -8,13 +8,13 @@
 package com.owncloud.android.operations.e2e
 
 import android.content.Context
-import com.nextcloud.client.account.UserAccountManager
-import com.nextcloud.client.di.Injectable
+import com.nextcloud.client.account.User
 import com.nextcloud.client.network.ClientFactory
 import com.nextcloud.utils.e2ee.E2EVersionHelper.isV2Plus
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.e2e.v2.decrypted.DecryptedFolderMetadataFile
+import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.operations.RefreshFolderOperation
 import com.owncloud.android.utils.theme.CapabilityUtils
@@ -24,57 +24,54 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import javax.inject.Inject
-
-class E2EECounterFetchOperation: Injectable {
-    @Inject
-    lateinit var accountManager: UserAccountManager
-
-    @Inject
-    lateinit var clientFactory: ClientFactory
 
+class E2EECounterFetchOperation {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     companion object {
         private const val TAG = "E2EECounterFetchOperation"
     }
 
     fun fetchAsync(
+        context: Context,
         file: OCFile,
         storageManager: FileDataStorageManager,
-        context: Context,
+        user: User,
+        clientFactory: ClientFactory,
         onComplete: (Long) -> Unit
     ) {
         scope.launch {
-            val counter = resolveE2EECounter(file, storageManager, context)
+            val client = clientFactory.create(user)
+            val counter = fetch(context, file, storageManager, user, client)
             withContext(Dispatchers.Main) {
                 onComplete(counter)
             }
         }
     }
 
-    fun resolveE2EECounter(
+    fun fetch(
+        context: Context,
         file: OCFile,
         storageManager: FileDataStorageManager,
-        context: Context
-    ): Long {
-        return try {
-            val client = clientFactory.create(accountManager.user)
-            val metadata = RefreshFolderOperation
-                .getDecryptedFolderMetadata(true, file, client, accountManager.user, context)
-            if (metadata is DecryptedFolderMetadataFile) {
-                file.setE2eCounter(metadata.metadata.counter)
-                storageManager.saveFile(file)
-                Log_OC.i(TAG, "latest counter fetched")
-                metadata.metadata.counter
-            } else {
-                Log_OC.w(TAG, "local counter is used")
-                getFallbackCounter(context, file)
-            }
-        } catch (e: Exception) {
-            Log_OC.e(TAG, "error refreshing E2E counter: ${e.message}")
-            getFallbackCounter(context, file)
+        user: User,
+        client: OwnCloudClient
+    ): Long = try {
+        val metadata = RefreshFolderOperation
+            .getDecryptedFolderMetadata(true, file, client, user, context)
+        if (metadata is DecryptedFolderMetadataFile) {
+            val result = metadata.metadata.counter
+            file.setE2eCounter(result)
+            storageManager.saveFile(file)
+            Log_OC.i(TAG, "latest counter fetched, counter is: $result")
+            result
+        } else {
+            val result = getFallbackCounter(context, file)
+            Log_OC.w(TAG, "local counter is used, counter is: $result")
+            result
         }
+    } catch (e: Exception) {
+        Log_OC.e(TAG, "error refreshing E2E counter: ${e.message}")
+        getFallbackCounter(context, file)
     }
 
     fun stop() {

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

@@ -352,7 +352,8 @@ private void setupView() {
                binding.internalShareDescription.setVisibility(View.VISIBLE);
                binding.externalSharesHeadline.setText(getResources().getString(R.string.create_end_to_end_encrypted_share_title));
                 final Context context = requireContext();
-                e2eeCounterFetchOperation.fetchAsync(file, fileDataStorageManager, context, counter -> {
+
+                e2eeCounterFetchOperation.fetchAsync(context, file, fileDataStorageManager, user, clientFactory, counter -> {
                     if (binding == null) {
                         return Unit.INSTANCE;
                     }