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

Format ktlint

Browse Source
This commit is contained in:
ganfra 2022-06-09 11:14:49 +02:00
parent 87c1d69e26
commit c0f3f394ac
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/Device.kt
View File

@ -114,7 +114,7 @@ internal class Device @AssistedInject constructor(
try { try {
requestSender.sendVerificationRequest(result.request) requestSender.sendVerificationRequest(result.request)
sasVerificationFactory.create(result.sas) sasVerificationFactory.create(result.sas)
}catch (failure: Throwable){ } catch (failure: Throwable) {
innerMachine.cancelVerification(result.sas.otherUserId, result.sas.flowId, CancelCode.UserError.value) innerMachine.cancelVerification(result.sas.otherUserId, result.sas.flowId, CancelCode.UserError.value)
null null
} }

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/network/RequestSender.kt
View File

@ -132,7 +132,12 @@ internal class RequestSender @Inject constructor(
return responseAdapter.toJson(sendResponse) return responseAdapter.toJson(sendResponse)
} }
suspend fun sendRoomMessage(eventType: String, roomId: String, content: String, transactionId: String, retryCount: Int = DEFAULT_REQUEST_RETRY_COUNT): SendResponse { suspend fun sendRoomMessage(eventType: String,
roomId: String,
content: String,
transactionId: String,
retryCount: Int = DEFAULT_REQUEST_RETRY_COUNT
): SendResponse {
val paramsAdapter = moshi.adapter<Content>(Map::class.java) val paramsAdapter = moshi.adapter<Content>(Map::class.java)
val jsonContent = paramsAdapter.fromJson(content) val jsonContent = paramsAdapter.fromJson(content)
val event = Event(eventType, transactionId, jsonContent, roomId = roomId) val event = Event(eventType, transactionId, jsonContent, roomId = roomId)

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
View File

@ -35,7 +35,7 @@ internal interface SendToDeviceTask : Task<SendToDeviceTask.Params, Unit> {
// the transactionId. If not provided, a transactionId will be created by the task // the transactionId. If not provided, a transactionId will be created by the task
val transactionId: String? = null, val transactionId: String? = null,
// Number of retry before failing // Number of retry before failing
val retryCount:Int = DEFAULT_REQUEST_RETRY_COUNT val retryCount: Int = DEFAULT_REQUEST_RETRY_COUNT
) )
} }