From 680325b5eed1dd7368d24a9758301492d79184ef Mon Sep 17 00:00:00 2001 From: Nicholas Date: Fri, 16 Dec 2022 16:12:11 -0500 Subject: [PATCH] Increase MediaPreviewV2 lifecycle logging. --- .../securesms/mediapreview/MediaPreviewRepository.kt | 9 +++++++++ .../securesms/mediapreview/MediaPreviewV2Fragment.kt | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt index 476407d7fc..4e2d6ce9f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt @@ -7,6 +7,7 @@ import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.schedulers.Schedulers +import org.signal.core.util.Stopwatch import org.signal.core.util.logging.Log import org.signal.core.util.requireLong import org.thoughtcrime.securesms.attachments.AttachmentId @@ -89,10 +90,18 @@ class MediaPreviewRepository { fun getMessagePositionIntent(context: Context, messageId: Long): Single { return Single.fromCallable { + val stopwatch = Stopwatch("Message Position Intent") val messageRecord: MessageRecord = SignalDatabase.mms.getMessageRecord(messageId) + stopwatch.split("get message record") + val threadId: Long = messageRecord.threadId val messagePosition: Int = SignalDatabase.mmsSms.getMessagePositionInConversation(threadId, messageRecord.dateReceived) + stopwatch.split("get message position") + val recipientId: RecipientId = SignalDatabase.threads.getRecipientForThreadId(threadId)?.id ?: throw IllegalStateException("Could not find recipient for thread ID $threadId") + stopwatch.split("get recipient ID") + + stopwatch.stop(TAG) ConversationIntents.createBuilder(context, recipientId, threadId) .withStartingPosition(messagePosition) .build() diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt index 595bc48aa2..e102cd90ac 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt @@ -26,7 +26,6 @@ import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.isVisible -import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearSmoothScroller @@ -41,6 +40,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.kotlin.subscribeBy import org.signal.core.util.concurrent.SignalExecutors import org.signal.core.util.logging.Log +import org.thoughtcrime.securesms.LoggingFragment import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.components.ViewBinderDelegate @@ -74,7 +74,7 @@ import java.util.Locale import java.util.concurrent.TimeUnit import kotlin.math.roundToInt -class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), MediaPreviewFragment.Events { +class MediaPreviewV2Fragment : LoggingFragment(R.layout.fragment_media_preview_v2), MediaPreviewFragment.Events { private val TAG = Log.tag(MediaPreviewV2Fragment::class.java) private val lifecycleDisposable = LifecycleDisposable()