Cleanup ViewModel

This commit is contained in:
andrew 2023-07-09 23:31:43 +09:30
parent d8b85768d2
commit bbc9cdfeeb
1 changed files with 14 additions and 15 deletions

View File

@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.conversation.v2
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.lifecycle.HiltViewModel
import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
import org.session.libsession.utilities.Util
@ -11,6 +10,7 @@ import org.session.libsession.utilities.recipients.Recipient
import org.thoughtcrime.securesms.database.AttachmentDatabase
import org.thoughtcrime.securesms.database.model.MessageRecord
import org.thoughtcrime.securesms.database.model.MmsMessageRecord
import org.thoughtcrime.securesms.mms.ImageSlide
import org.thoughtcrime.securesms.mms.Slide
import java.util.*
import java.util.concurrent.TimeUnit
@ -32,7 +32,9 @@ data class MessageDetails(
data class Attachment(
val slide: Slide,
val fileDetails: List<TitledText>
)
) {
fun hasImage() = slide is ImageSlide
}
@HiltViewModel
class MessageDetailsViewModel @Inject constructor(
@ -77,10 +79,9 @@ class MessageDetailsViewModel @Inject constructor(
private fun AttachmentDatabase.duration(slide: Slide): String? =
slide.takeIf { it.hasAudio() }
?.run { asAttachment() as? DatabaseAttachment }
?.run {
getAttachmentAudioExtras(attachmentId)
?.let { audioExtras ->
audioExtras.durationMs.takeIf { it > 0 }?.let {
?.run { getAttachmentAudioExtras(attachmentId)?.durationMs }
?.takeIf { it > 0 }
?.let {
String.format(
"%01d:%02d",
TimeUnit.MILLISECONDS.toMinutes(it),
@ -88,5 +89,3 @@ class MessageDetailsViewModel @Inject constructor(
)
}
}
}
}