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

Add logging to forward fragment closes.

Browse source
This commit is contained in:
Alex Hart 2022-09-30 15:37:25 -03:00 • committed by Greyson Parrelli
parent 083219888c
commit 437c3ffd66
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardActivity.kt
View file

@ -8,6 +8,7 @@ import androidx.activity.result.contract.ActivityResultContract
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.FragmentWrapperActivity import org.thoughtcrime.securesms.components.FragmentWrapperActivity
import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey 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 { open class MultiselectForwardActivity : FragmentWrapperActivity(), MultiselectForwardFragment.Callback, SearchConfigurationProvider {
companion object { companion object {
private val TAG = Log.tag(MultiselectForwardActivity::class.java)
private const val ARGS = "args" 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() { override fun exitFlow() {
Log.d(TAG, "Exiting flow...")
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }

9
app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
View file

@ -29,6 +29,7 @@ import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import org.signal.core.util.DimensionUnit import org.signal.core.util.DimensionUnit
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.ContactFilterView import org.thoughtcrime.securesms.components.ContactFilterView
import org.thoughtcrime.securesms.components.TooltipPopup import org.thoughtcrime.securesms.components.TooltipPopup
@ -318,6 +319,8 @@ class MultiselectForwardFragment :
} }
private fun dismissAndShowToast(@PluralsRes toastTextResId: Int) { private fun dismissAndShowToast(@PluralsRes toastTextResId: Int) {
Log.d(TAG, "dismissAndShowToast")
val argCount = getMessageCount() val argCount = getMessageCount()
callback.onFinishForwardAction() callback.onFinishForwardAction()
@ -329,6 +332,8 @@ class MultiselectForwardFragment :
private fun getMessageCount(): Int = args.multiShareArgs.size + if (addMessage.text.isNotEmpty()) 1 else 0 private fun getMessageCount(): Int = args.multiShareArgs.size + if (addMessage.text.isNotEmpty()) 1 else 0
private fun handleMessageExpired() { private fun handleMessageExpired() {
Log.d(TAG, "handleMessageExpired")
callback.onFinishForwardAction() callback.onFinishForwardAction()
dismissibleDialog?.dismiss() dismissibleDialog?.dismiss()
Toast.makeText(requireContext(), resources.getQuantityString(R.plurals.MultiselectForwardFragment__couldnt_forward_messages, args.multiShareArgs.size), Toast.LENGTH_LONG).show() 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<ContactSearchKey>) { private fun dismissWithSelection(selectedContacts: Set<ContactSearchKey>) {
Log.d(TAG, "dismissWithSelection")
callback.onFinishForwardAction() callback.onFinishForwardAction()
dismissibleDialog?.dismiss() dismissibleDialog?.dismiss()
@ -486,6 +493,8 @@ class MultiselectForwardFragment :
} }
companion object { companion object {
private val TAG = Log.tag(MultiselectForwardActivity::class.java)
const val DIALOG_TITLE = "title" const val DIALOG_TITLE = "title"
const val ARGS = "args" const val ARGS = "args"
const val RESULT_KEY = "result_key" const val RESULT_KEY = "result_key"