mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 14:38:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: rename parameters, make some fields private, add Javadoc, fix copy paste error

Browse source
This commit is contained in:
Benoit Marty 2020-09-02 12:03:03 +02:00
parent bf4f869524
commit 28081aa7d2
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
View file

@ -124,8 +124,14 @@ interface SendService {
*/ */
fun deleteFailedEcho(localEcho: TimelineEvent) fun deleteFailedEcho(localEcho: TimelineEvent)
/**
* Delete all the events in one of the sending states
*/
fun clearSendingQueue() fun clearSendingQueue()
/**
* Cancel sending a specific event. It has to be in one of the sending states
*/
fun cancelSend(eventId: String) fun cancelSend(eventId: String)
/** /**

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MatrixDigestCheckInputStream.kt
View file

@ -22,9 +22,12 @@ import java.io.IOException
import java.io.InputStream import java.io.InputStream
import java.security.MessageDigest import java.security.MessageDigest
class MatrixDigestCheckInputStream(`in`: InputStream?, val expectedDigest: String) : FilterInputStream(`in`) { class MatrixDigestCheckInputStream(
inputStream: InputStream?,
private val expectedDigest: String
) : FilterInputStream(inputStream) {
val digest = MessageDigest.getInstance("SHA-256") private val digest = MessageDigest.getInstance("SHA-256")
@Throws(IOException::class) @Throws(IOException::class)
override fun read(): Int { override fun read(): Int {

6
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
View file

@ -1076,12 +1076,12 @@ class RoomDetailViewModel @AssistedInject constructor(
private fun handleCancel(action: RoomDetailAction.CancelSend) { private fun handleCancel(action: RoomDetailAction.CancelSend) {
val targetEventId = action.eventId val targetEventId = action.eventId
room.getTimeLineEvent(targetEventId)?.let { room.getTimeLineEvent(targetEventId)?.let {
// State must be UNDELIVERED or Failed // State must be in one of the sending states
if (!it.root.sendState.isSending()) { if (!it.root.sendState.isSending()) {
Timber.e("Cannot resend message, it is not failed, Cancel first") Timber.e("Cannot cancel message, it is not sending")
return return
} }
room.cancelSend(action.eventId) room.cancelSend(targetEventId)
} }
} }