Skip to content

fix(e2ee): version detection#17103

Open
alperozturk96 wants to merge 7 commits into
masterfrom
fix/e2ee-version-detection
Open

fix(e2ee): version detection#17103
alperozturk96 wants to merge 7 commits into
masterfrom
fix/e2ee-version-detection

Conversation

@alperozturk96

@alperozturk96 alperozturk96 commented May 29, 2026

Copy link
Copy Markdown
Collaborator

@alperozturk96 alperozturk96 mentioned this pull request May 29, 2026
Open
@alperozturk96 alperozturk96 marked this pull request as draft May 29, 2026 06:59
@github-actions

github-actions Bot commented May 29, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/26623118958/artifacts/7285051492
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@github-actions

github-actions Bot commented May 29, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/26626813195/artifacts/7286688680
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96
fix(e2ee): version detection
6cf36ab 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
use capabilities e2e api version instead latest
28f268c 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96 alperozturk96 force-pushed the fix/e2ee-version-detection branch from c86d000 to 28f268c Compare June 12, 2026 07:59
alperozturk96
alperozturk96 commented Jun 12, 2026
View reviewed changes
Comment thread app/src/main/java/com/nextcloud/utils/e2ee/E2EVersionHelper.kt
*
* @param isV2 indicates whether the E2EE v2 series should be used
*/
fun latestVersion(isV2: Boolean): E2EVersion = if (isV2) {

@alperozturk96 alperozturk96 Jun 12, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to the library since we have there E2EVersion

alperozturk96
alperozturk96 commented Jun 12, 2026
View reviewed changes
Comment thread ...src/main/java/com/owncloud/android/datamodel/e2e/v2/decrypted/DecryptedFolderMetadataFile.kt
@Transient
val filedrop: MutableMap<String, DecryptedFile> = HashMap(),
val version: String = E2EVersionHelper.latestVersion(true).value
val version: String

@alperozturk96 alperozturk96 Jun 12, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must be injected from capabilities we should not give latest value. @tobiasKaminsky as we discussed.

@github-actions

github-actions Bot commented Jun 12, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/27402851073/artifacts/7586314471
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96
do not use hardcoded v1 always rely on capabilities
303f173 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@github-actions

github-actions Bot commented Jun 12, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/27403838656/artifacts/7586785530
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96
use getMaxCompatibleE2EEVersion
18f6fc8 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
wip
c5c47c6 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
wip
00b36b2 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
wip
8eb6352 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96 alperozturk96 added this to the Nextcloud App 34.0.1 milestone Jun 12, 2026
@alperozturk96

alperozturk96 commented Jun 12, 2026

Copy link
Copy Markdown
Collaborator Author

/backport to stable-34.0.x

@alperozturk96 alperozturk96 marked this pull request as ready for review June 12, 2026 09:30
@nextcloud nextcloud deleted a comment from github-actions Bot Jun 12, 2026
@github-actions

github-actions Bot commented Jun 12, 2026

Copy link
Copy Markdown

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

@github-actions

github-actions Bot commented Jun 12, 2026

Copy link
Copy Markdown

test-Unit test failed, but no output was generated. Maybe a preliminary stage failed.

@github-actions

github-actions Bot commented Jun 12, 2026

Copy link
Copy Markdown

Codacy

SpotBugs

CategoryBaseNew
Bad practice3333
Correctness6767
Dodgy code215216
Experimental11
Internationalization77
Malicious code vulnerability22
Multithreaded correctness3131
Performance4141
Security1616
Total413414

SpotBugs increased!

@github-actions

github-actions Bot commented Jun 12, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/27407225960/artifacts/7589399283
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tobiasKaminsky tobiasKaminsky Awaiting requested review from tobiasKaminsky

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

3. to review backport-request

Projects

None yet

Milestone

Nextcloud App 34.0.1

Development

Successfully merging this pull request may close these issues.

1 participant

@alperozturk96