filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`toQrCodeData()` is now internal

This commit is contained in:
Benoit Marty 2022-04-11 16:21:38 +02:00 committed by Benoit Marty
parent 3735ac307f
commit 16c8296735
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
View File

@ -23,7 +23,7 @@ import org.matrix.android.sdk.internal.extensions.toUnsignedInt
// MATRIX // MATRIX
private val prefix = "MATRIX".toByteArray(Charsets.ISO_8859_1) private val prefix = "MATRIX".toByteArray(Charsets.ISO_8859_1)
fun QrCodeData.toEncodedString(): String { internal fun QrCodeData.toEncodedString(): String {
var result = ByteArray(0) var result = ByteArray(0)
// MATRIX // MATRIX
@ -67,7 +67,7 @@ fun QrCodeData.toEncodedString(): String {
return result.toString(Charsets.ISO_8859_1) return result.toString(Charsets.ISO_8859_1)
} }
fun String.toQrCodeData(): QrCodeData? { internal fun String.toQrCodeData(): QrCodeData? {
val byteArray = toByteArray(Charsets.ISO_8859_1) val byteArray = toByteArray(Charsets.ISO_8859_1)
// Size should be min 6 + 1 + 1 + 2 + ? + 32 + 32 + ? = 74 + transactionLength + secretLength // Size should be min 6 + 1 + 1 + 2 + ? + 32 + 32 + ? = 74 + transactionLength + secretLength

5
vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
View File

@ -49,7 +49,6 @@ import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesDarkActivity
import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesLightActivity import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesLightActivity
import im.vector.lib.ui.styles.debug.DebugVectorTextViewDarkActivity import im.vector.lib.ui.styles.debug.DebugVectorTextViewDarkActivity
import im.vector.lib.ui.styles.debug.DebugVectorTextViewLightActivity import im.vector.lib.ui.styles.debug.DebugVectorTextViewLightActivity
import org.matrix.android.sdk.internal.crypto.verification.qrcode.toQrCodeData
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
@ -251,7 +250,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
// renderQrCode(QrCodeScannerActivity.getResultText(data) ?: "") // renderQrCode(QrCodeScannerActivity.getResultText(data) ?: "")
val result = QrCodeScannerActivity.getResultText(activityResult.data)!! val result = QrCodeScannerActivity.getResultText(activityResult.data)!!
val qrCodeData = result.toQrCodeData() val qrCodeData = null // This is now internal: result.toQrCodeData()
Timber.e("qrCodeData: $qrCodeData") Timber.e("qrCodeData: $qrCodeData")
if (result.length != buffer.size) { if (result.length != buffer.size) {
@ -265,6 +264,8 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
} }
} }
} }
// Ensure developer will see that this cannot work anymore
error("toQrCodeData() is now internal")
} }
} }
} }