-
-
Notifications
You must be signed in to change notification settings - Fork 2k
fix(e2ee-upload): counter usage #17031
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
alperozturk96
wants to merge
4
commits into
master
Choose a base branch
from
fix/e2ee-upload-file
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+126
−57
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
app/src/main/java/com/owncloud/android/operations/e2e/E2EECounterFetchOperation.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Nextcloud - Android Client | ||
| * | ||
| * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com> | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| package com.owncloud.android.operations.e2e | ||
|
|
||
| import android.content.Context | ||
| 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 | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.SupervisorJob | ||
| import kotlinx.coroutines.cancel | ||
| import kotlinx.coroutines.launch | ||
| import kotlinx.coroutines.withContext | ||
|
|
||
| class E2EECounterFetchOperation { | ||
| private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) | ||
|
|
||
| companion object { | ||
| private const val TAG = "E2EECounterFetchOperation" | ||
| } | ||
|
|
||
| fun fetchAsync( | ||
| context: Context, | ||
| file: OCFile, | ||
| storageManager: FileDataStorageManager, | ||
| user: User, | ||
| clientFactory: ClientFactory, | ||
| onComplete: (Long) -> Unit | ||
| ) { | ||
| scope.launch { | ||
| val client = clientFactory.create(user) | ||
| val counter = fetch(context, file, storageManager, user, client) | ||
| withContext(Dispatchers.Main) { | ||
| onComplete(counter) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun fetch( | ||
| context: Context, | ||
| file: OCFile, | ||
| storageManager: FileDataStorageManager, | ||
| 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() { | ||
| scope.cancel() | ||
| } | ||
|
|
||
| // region private methods | ||
| private fun supportsE2EEv2(context: Context): Boolean { | ||
| val capability = CapabilityUtils.getCapability(context) | ||
| return isV2Plus(capability) | ||
| } | ||
|
|
||
| private fun getFallbackCounter(context: Context, file: OCFile): Long { | ||
| if (!supportsE2EEv2(context)) { | ||
| return -1 | ||
| } | ||
| return file.e2eCounter + 1 | ||
| } | ||
| // endregion | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check parent folder.