Skip to content

Commit 085bf82

Browse files
authored
Merge pull request #8817 from element-hq/hughns/qr-mscs-closed
Add note about MSC3886, MSC3903 and MSC3906 being closed
2 parents 0e94a49 + 2362fcd commit 085bf82

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
3737
import org.matrix.android.sdk.api.util.MatrixJsonParser
3838
import timber.log.Timber
3939

40+
// n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed.
41+
// However, we want to keep this implementation around for some time.
42+
// TODO define an end-of-life date for this implementation.
43+
4044
/**
4145
* Implementation of MSC3906 to sign in + E2EE set up using a QR code.
4246
*/

vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ import im.vector.app.features.home.HomeActivity
3030
import im.vector.lib.core.utils.compat.getParcelableCompat
3131
import timber.log.Timber
3232

33+
// n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed.
34+
// However, we want to keep this implementation around for some time.
35+
// TODO define an end-of-life date for this implementation.
36+
3337
@AndroidEntryPoint
3438
class QrCodeLoginActivity : SimpleFragmentActivity() {
3539

0 commit comments

Comments
 (0)