From 04c132853a356f5fe616b9c28543cf31fb3747fc Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Thu, 22 Oct 2020 13:55:00 +1100 Subject: [PATCH] Minor cleanup. --- .../loki/api/PrepareAttachmentAudioExtrasJob.kt | 12 +++++------- .../securesms/loki/views/MessageAudioView.kt | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt b/src/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt index 0f4d7cd492..e0f7a880fc 100644 --- a/src/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt +++ b/src/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt @@ -116,15 +116,13 @@ class PrepareAttachmentAudioExtrasJob : BaseJob { } } - val audioExtras = DatabaseAttachmentAudioExtras( + attachDb.setAttachmentAudioExtras(DatabaseAttachmentAudioExtras( attachmentId, rmsValues, totalDurationMs - ) + )) - attachDb.setAttachmentAudioExtras(audioExtras) - - EventBus.getDefault().post(AudioExtrasUpdatedEvent(audioExtras)) + EventBus.getDefault().post(AudioExtrasUpdatedEvent(attachmentIdattachmentId)) } class Factory : Job.Factory { @@ -133,8 +131,8 @@ class PrepareAttachmentAudioExtrasJob : BaseJob { } } - /** Dispatched once the audio extras have been updated. */ - data class AudioExtrasUpdatedEvent(val audioExtras: DatabaseAttachmentAudioExtras) + /** Gets dispatched once the audio extras have been updated. */ + data class AudioExtrasUpdatedEvent(val attachmentId: AttachmentId) @RequiresApi(Build.VERSION_CODES.M) private class InputStreamMediaDataSource: MediaDataSource { diff --git a/src/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt b/src/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt index a74b638de4..460accc0a9 100644 --- a/src/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt +++ b/src/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt @@ -290,7 +290,7 @@ class MessageAudioView: FrameLayout, AudioSlidePlayer.Listener { @Subscribe(threadMode = ThreadMode.MAIN) fun onEvent(event: PrepareAttachmentAudioExtrasJob.AudioExtrasUpdatedEvent) { - if (event.audioExtras.attachmentId == obtainDatabaseAttachment()?.attachmentId) { + if (event.attachmentId == obtainDatabaseAttachment()?.attachmentId) { updateFromAttachmentAudioExtras() } }