empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add logging to share activity.

Browse source
This commit is contained in:
Alex Hart 2022-07-25 12:43:30 -03:00 • committed by Cody Henthorne
parent b0d75a8a5a
commit 09b92a6559
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt
View file

@ -11,6 +11,7 @@ import androidx.activity.viewModels
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.content.pm.ShortcutManagerCompat import androidx.core.content.pm.ShortcutManagerCompat
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.PassphraseRequiredActivity
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
@ -32,6 +33,10 @@ import java.util.Optional
class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.Callback { class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.Callback {
companion object {
private val TAG = Log.tag(ShareActivity::class.java)
}
private val dynamicTheme = DynamicNoActionBarTheme() private val dynamicTheme = DynamicNoActionBarTheme()
private val lifecycleDisposable = LifecycleDisposable() private val lifecycleDisposable = LifecycleDisposable()
@ -74,6 +79,7 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C
is ShareState.ShareDataLoadState.Loaded -> { is ShareState.ShareDataLoadState.Loaded -> {
val directShareTarget = this.directShareTarget val directShareTarget = this.directShareTarget
if (directShareTarget != null) { if (directShareTarget != null) {
Log.d(TAG, "Encountered a direct share target. Opening conversation with resolved share data.")
openConversation( openConversation(
ShareEvent.OpenConversation( ShareEvent.OpenConversation(
shareState.loadState.resolvedShareData, shareState.loadState.resolvedShareData,
@ -162,6 +168,8 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C
error("Can't open a conversation for a story!") error("Can't open a conversation for a story!")
} }
Log.d(TAG, "Opening conversation...")
val multiShareArgs = shareEvent.getMultiShareArgs() val multiShareArgs = shareEvent.getMultiShareArgs()
val conversationIntentBuilder = ConversationIntents.createBuilder(this, shareEvent.contact.recipientId, -1L) val conversationIntentBuilder = ConversationIntents.createBuilder(this, shareEvent.contact.recipientId, -1L)
.withDataUri(multiShareArgs.dataUri) .withDataUri(multiShareArgs.dataUri)
@ -176,6 +184,8 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C
} }
private fun openMediaInterstitial(shareEvent: ShareEvent.OpenMediaInterstitial) { private fun openMediaInterstitial(shareEvent: ShareEvent.OpenMediaInterstitial) {
Log.d(TAG, "Opening media share interstitial...")
val multiShareArgs = shareEvent.getMultiShareArgs() val multiShareArgs = shareEvent.getMultiShareArgs()
val media: MutableList<Media> = ArrayList(multiShareArgs.media) val media: MutableList<Media> = ArrayList(multiShareArgs.media)
if (media.isEmpty() && multiShareArgs.dataUri != null) { if (media.isEmpty() && multiShareArgs.dataUri != null) {
@ -212,10 +222,14 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C
} }
private fun openTextInterstitial(shareEvent: ShareEvent.OpenTextInterstitial) { private fun openTextInterstitial(shareEvent: ShareEvent.OpenTextInterstitial) {
Log.d(TAG, "Opening text share interstitial...")
finishOnOkResultLauncher.launch(ShareInterstitialActivity.createIntent(this, shareEvent.getMultiShareArgs())) finishOnOkResultLauncher.launch(ShareInterstitialActivity.createIntent(this, shareEvent.getMultiShareArgs()))
} }
private fun sendWithoutInterstitial(shareEvent: ShareEvent.SendWithoutInterstitial) { private fun sendWithoutInterstitial(shareEvent: ShareEvent.SendWithoutInterstitial) {
Log.d(TAG, "Sending without an interstitial...")
MultiShareSender.send(shareEvent.getMultiShareArgs()) { results: MultiShareSendResultCollection? -> MultiShareSender.send(shareEvent.getMultiShareArgs()) { results: MultiShareSendResultCollection? ->
MultiShareDialogs.displayResultDialog(this, results!!) { MultiShareDialogs.displayResultDialog(this, results!!) {
finish() finish()