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

Fix missing implem

This commit is contained in:
valere 2023-05-11 10:48:28 +02:00
parent 7d9330b2ee
commit 1a1f6810e2
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/RustCrossSigningService.kt
View File

@ -44,7 +44,7 @@ internal class RustCrossSigningService @Inject constructor(
override suspend fun isCrossSigningVerified(): Boolean { override suspend fun isCrossSigningVerified(): Boolean {
return when (val identity = olmMachine.getIdentity(olmMachine.userId())) { return when (val identity = olmMachine.getIdentity(olmMachine.userId())) {
is OwnUserIdentity -> identity.verified() is OwnUserIdentity -> identity.verified()
else -> false else -> false
} }
} }
@ -177,7 +177,7 @@ internal class RustCrossSigningService @Inject constructor(
throw IllegalArgumentException("This device [$deviceId] is not known, or not yours") throw IllegalArgumentException("This device [$deviceId] is not known, or not yours")
} }
} else { } else {
throw IllegalArgumentException("This device [$deviceId] is not known") throw IllegalArgumentException("This device [$deviceId] is not known")
} }
} }
@ -238,6 +238,6 @@ internal class RustCrossSigningService @Inject constructor(
override fun checkOtherMSKTrusted(myCrossSigningInfo: MXCrossSigningInfo?, otherInfo: MXCrossSigningInfo?): UserTrustResult { override fun checkOtherMSKTrusted(myCrossSigningInfo: MXCrossSigningInfo?, otherInfo: MXCrossSigningInfo?): UserTrustResult {
// is this needed in rust? should be moved to internal API? // is this needed in rust? should be moved to internal API?
TODO() UserTrustResult.Failure("Not used in rust")
} }
} }

22
vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
View File

@ -241,12 +241,8 @@ class DefaultNavigator @Inject constructor(
} }
if (context is AppCompatActivity) { if (context is AppCompatActivity) {
TODO() SelfVerificationBottomSheet.forTransaction(tx.transactionId)
// VerificationBottomSheet.withArgs( .show(context.supportFragmentManager, "VERIF")
// roomId = null,
// otherUserId = otherUserId,
// transactionId = sasTransactionId
// ).show(context.supportFragmentManager, "REQPOP")
} }
} }
} }
@ -254,16 +250,14 @@ class DefaultNavigator @Inject constructor(
override fun requestSessionVerification(context: Context, otherSessionId: String) { override fun requestSessionVerification(context: Context, otherSessionId: String) {
coroutineScope.launch { coroutineScope.launch {
val session = sessionHolder.getSafeActiveSession() ?: return@launch val session = sessionHolder.getSafeActiveSession() ?: return@launch
// val pr = val request = session.cryptoService().verificationService().requestDeviceVerification(
session.cryptoService().verificationService().requestSelfKeyVerification( supportedVerificationMethodsProvider.provide(),
supportedVerificationMethodsProvider.provide() session.myUserId,
otherSessionId
) )
if (context is AppCompatActivity) { if (context is AppCompatActivity) {
TODO() SelfVerificationBottomSheet.forTransaction(request.transactionId)
// VerificationBottomSheet.withArgs( .show(context.supportFragmentManager, "VERIF")
// otherUserId = session.myUserId,
// transactionId = pr.requestId()
// ).show(context.supportFragmentManager)
} }
} }
} }