From 437c3ffd669e43b2024c54ddfe7bc53cfd5d7d45 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 30 Sep 2022 15:37:25 -0300 Subject: [PATCH] Add logging to forward fragment closes. --- .../mutiselect/forward/MultiselectForwardActivity.kt | 7 ++++++- .../mutiselect/forward/MultiselectForwardFragment.kt | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardActivity.kt index 53b835f989..223b378907 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardActivity.kt @@ -8,6 +8,7 @@ import androidx.activity.result.contract.ActivityResultContract import androidx.appcompat.widget.Toolbar import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment +import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.FragmentWrapperActivity import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey @@ -16,6 +17,7 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor open class MultiselectForwardActivity : FragmentWrapperActivity(), MultiselectForwardFragment.Callback, SearchConfigurationProvider { companion object { + private val TAG = Log.tag(MultiselectForwardActivity::class.java) private const val ARGS = "args" } @@ -43,9 +45,12 @@ open class MultiselectForwardActivity : FragmentWrapperActivity(), MultiselectFo ) } - override fun onFinishForwardAction() = Unit + override fun onFinishForwardAction() { + Log.d(TAG, "Completed forward action...") + } override fun exitFlow() { + Log.d(TAG, "Exiting flow...") onBackPressedDispatcher.onBackPressed() } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt index 185a084e02..7c6ebba575 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt @@ -29,6 +29,7 @@ import androidx.fragment.app.viewModels import androidx.recyclerview.widget.RecyclerView import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.signal.core.util.DimensionUnit +import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ContactFilterView import org.thoughtcrime.securesms.components.TooltipPopup @@ -318,6 +319,8 @@ class MultiselectForwardFragment : } private fun dismissAndShowToast(@PluralsRes toastTextResId: Int) { + Log.d(TAG, "dismissAndShowToast") + val argCount = getMessageCount() callback.onFinishForwardAction() @@ -329,6 +332,8 @@ class MultiselectForwardFragment : private fun getMessageCount(): Int = args.multiShareArgs.size + if (addMessage.text.isNotEmpty()) 1 else 0 private fun handleMessageExpired() { + Log.d(TAG, "handleMessageExpired") + callback.onFinishForwardAction() dismissibleDialog?.dismiss() Toast.makeText(requireContext(), resources.getQuantityString(R.plurals.MultiselectForwardFragment__couldnt_forward_messages, args.multiShareArgs.size), Toast.LENGTH_LONG).show() @@ -336,6 +341,8 @@ class MultiselectForwardFragment : } private fun dismissWithSelection(selectedContacts: Set) { + Log.d(TAG, "dismissWithSelection") + callback.onFinishForwardAction() dismissibleDialog?.dismiss() @@ -486,6 +493,8 @@ class MultiselectForwardFragment : } companion object { + private val TAG = Log.tag(MultiselectForwardActivity::class.java) + const val DIALOG_TITLE = "title" const val ARGS = "args" const val RESULT_KEY = "result_key"