From a8a9c61a691a3c6c43117e496b89ddca70260f03 Mon Sep 17 00:00:00 2001 From: Hugh Nimmo-Smith Date: Fri, 3 May 2024 13:16:31 +0100 Subject: [PATCH 1/2] Add note about MSC3886, MSC3903 and MSC3906 being closed --- .../java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt | 4 ++++ .../im/vector/app/features/login/qr/QrCodeLoginActivity.kt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt index d5596ce56f..7da8d27ee2 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt @@ -37,6 +37,10 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel import org.matrix.android.sdk.api.util.MatrixJsonParser import timber.log.Timber +// n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed. +// However, we want to keep this implementation around for some time. +// TODO: define an end-of-life date for this implementation. + /** * Implementation of MSC3906 to sign in + E2EE set up using a QR code. */ diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt index a0c113224d..55ab76da44 100644 --- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt +++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt @@ -30,6 +30,10 @@ import im.vector.app.features.home.HomeActivity import im.vector.lib.core.utils.compat.getParcelableCompat import timber.log.Timber +// n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed. +// However, we want to keep this implementation around for some time. +// TODO: define an end-of-life date for this implementation. + @AndroidEntryPoint class QrCodeLoginActivity : SimpleFragmentActivity() { From 2362fcde16a777eb8e1e1bc58e62141d89dfecf0 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 16 May 2024 14:02:15 +0200 Subject: [PATCH 2/2] TODO must not be followed by `:` --- .../java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt | 2 +- .../java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt index 7da8d27ee2..5bceecf643 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt @@ -39,7 +39,7 @@ import timber.log.Timber // n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed. // However, we want to keep this implementation around for some time. -// TODO: define an end-of-life date for this implementation. +// TODO define an end-of-life date for this implementation. /** * Implementation of MSC3906 to sign in + E2EE set up using a QR code. diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt index 55ab76da44..8eb8fd1ddc 100644 --- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt +++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt @@ -32,7 +32,7 @@ import timber.log.Timber // n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed. // However, we want to keep this implementation around for some time. -// TODO: define an end-of-life date for this implementation. +// TODO define an end-of-life date for this implementation. @AndroidEntryPoint class QrCodeLoginActivity : SimpleFragmentActivity() {