rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Hugh Nimmo-Smith 2022-10-13 22:23:26 +01:00
parent 7bc0bd3b57
commit 6399032312
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
View File

@ -130,13 +130,14 @@ interface AuthenticationService {
* Return true if qr code login is supported by the server, false otherwise. * Return true if qr code login is supported by the server, false otherwise.
*/ */
suspend fun isQrLoginSupported(homeServerConnectionConfig: HomeServerConnectionConfig): Boolean suspend fun isQrLoginSupported(homeServerConnectionConfig: HomeServerConnectionConfig): Boolean
/**
* Authenticate using m.login.token method during sign in with QR code. * Authenticate using m.login.token method during sign in with QR code.
* @param homeServerConnectionConfig the information about the homeserver and other configuration * @param homeServerConnectionConfig the information about the homeserver and other configuration
* @param loginToken the m.login.token * @param loginToken the m.login.token
* @param initialDeviceName the initial device name * @param initialDeviceName the initial device name
* @param deviceId the device id, optional. If not provided or null, the server will generate one. * @param deviceId the device id, optional. If not provided or null, the server will generate one.
*/ */
suspend fun loginUsingQrLoginToken( suspend fun loginUsingQrLoginToken(
homeServerConnectionConfig: HomeServerConnectionConfig, homeServerConnectionConfig: HomeServerConnectionConfig,
loginToken: String, loginToken: String,