From 09b92a65592b12d7e63747617d5c9697cb179628 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 25 Jul 2022 12:43:30 -0300 Subject: [PATCH] Add logging to share activity. --- .../securesms/sharing/v2/ShareActivity.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt index 28708db35..b367d8657 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt @@ -11,6 +11,7 @@ import androidx.activity.viewModels import androidx.core.content.ContextCompat import androidx.core.content.pm.ShortcutManagerCompat import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey @@ -32,6 +33,10 @@ import java.util.Optional class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.Callback { + companion object { + private val TAG = Log.tag(ShareActivity::class.java) + } + private val dynamicTheme = DynamicNoActionBarTheme() private val lifecycleDisposable = LifecycleDisposable() @@ -74,6 +79,7 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C is ShareState.ShareDataLoadState.Loaded -> { val directShareTarget = this.directShareTarget if (directShareTarget != null) { + Log.d(TAG, "Encountered a direct share target. Opening conversation with resolved share data.") openConversation( ShareEvent.OpenConversation( shareState.loadState.resolvedShareData, @@ -162,6 +168,8 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C error("Can't open a conversation for a story!") } + Log.d(TAG, "Opening conversation...") + val multiShareArgs = shareEvent.getMultiShareArgs() val conversationIntentBuilder = ConversationIntents.createBuilder(this, shareEvent.contact.recipientId, -1L) .withDataUri(multiShareArgs.dataUri) @@ -176,6 +184,8 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C } private fun openMediaInterstitial(shareEvent: ShareEvent.OpenMediaInterstitial) { + Log.d(TAG, "Opening media share interstitial...") + val multiShareArgs = shareEvent.getMultiShareArgs() val media: MutableList = ArrayList(multiShareArgs.media) if (media.isEmpty() && multiShareArgs.dataUri != null) { @@ -212,10 +222,14 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C } private fun openTextInterstitial(shareEvent: ShareEvent.OpenTextInterstitial) { + Log.d(TAG, "Opening text share interstitial...") + finishOnOkResultLauncher.launch(ShareInterstitialActivity.createIntent(this, shareEvent.getMultiShareArgs())) } private fun sendWithoutInterstitial(shareEvent: ShareEvent.SendWithoutInterstitial) { + Log.d(TAG, "Sending without an interstitial...") + MultiShareSender.send(shareEvent.getMultiShareArgs()) { results: MultiShareSendResultCollection? -> MultiShareDialogs.displayResultDialog(this, results!!) { finish()