diff --git a/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java b/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java index bd42e63ff3..8f33d8ad77 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java @@ -54,7 +54,6 @@ public final class GroupMembersDialog { } private void contactClick(@NonNull Recipient recipient) { - RecipientBottomSheetDialogFragment.create(recipient.getId(), groupRecipient.requireGroupId()) - .show(fragmentActivity.getSupportFragmentManager(), "BOTTOM"); + RecipientBottomSheetDialogFragment.show(fragmentActivity.getSupportFragmentManager(), recipient.getId(), groupRecipient.requireGroupId()); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java index 883c86f590..18595906c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java @@ -244,8 +244,7 @@ public final class AvatarImageView extends AppCompatImageView { ConversationSettingsActivity.createTransitionBundle(context, this)); } else { if (context instanceof FragmentActivity) { - RecipientBottomSheetDialogFragment.create(recipient.getId(), null) - .show(((FragmentActivity) context).getSupportFragmentManager(), "BOTTOM"); + RecipientBottomSheetDialogFragment.show(((FragmentActivity) context).getSupportFragmentManager(), recipient.getId(), null); } else { context.startActivity(ConversationSettingsActivity.forRecipient(context, recipient.getId()), ConversationSettingsActivity.createTransitionBundle(context, this)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt index a168664dc9..c282b03f4e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt @@ -95,8 +95,7 @@ fun ResultItem(result: InternalSearchResult, modifier: Modifier = Modifier) { .clickable { if (activity != null) { RecipientBottomSheetDialogFragment - .create(result.id, result.groupId) - .show(activity.supportFragmentManager, "TAG") + .show(activity.supportFragmentManager, result.id, result.groupId) } } .padding(8.dp) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt index 690afe430c..141eea7644 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt @@ -695,7 +695,7 @@ class ConversationSettingsFragment : DSLSettingsFragment( recipient = member.member, isAdmin = member.isAdmin, onClick = { - RecipientBottomSheetDialogFragment.create(member.member.id, groupState.groupId).show(parentFragmentManager, "BOTTOM") + RecipientBottomSheetDialogFragment.show(parentFragmentManager, member.member.id, groupState.groupId) } ) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index 093a6e1a66..a1ff526db2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -2725,7 +2725,7 @@ class ConversationFragment : override fun onGroupMemberClicked(recipientId: RecipientId, groupId: GroupId) { context ?: return - RecipientBottomSheetDialogFragment.create(recipientId, groupId).show(childFragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG) + RecipientBottomSheetDialogFragment.show(childFragmentManager, recipientId, groupId) } override fun onMessageWithErrorClicked(messageRecord: MessageRecord) { @@ -2858,10 +2858,11 @@ class ConversationFragment : override fun onRecipientNameClicked(target: RecipientId) { context ?: return disposables += viewModel.recipient.firstOrError().observeOn(AndroidSchedulers.mainThread()).subscribeBy { - RecipientBottomSheetDialogFragment.create( + RecipientBottomSheetDialogFragment.show( + parentFragmentManager, target, it.groupId.orElse(null) - ).show(parentFragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG) + ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesFragment.java index a4aa07105c..82b5a9289d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesFragment.java @@ -52,9 +52,7 @@ public class PendingMemberInvitesFragment extends Fragment { youInvited.initializeAdapter(getViewLifecycleOwner()); othersInvited.initializeAdapter(getViewLifecycleOwner()); - youInvited.setRecipientClickListener(recipient -> - RecipientBottomSheetDialogFragment.create(recipient.getId(), null) - .show(requireActivity().getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)); + youInvited.setRecipientClickListener(recipient -> RecipientBottomSheetDialogFragment.show(requireActivity().getSupportFragmentManager(), recipient.getId(), null)); youInvited.setAdminActionsListener(new AdminActionsListener() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/requesting/RequestingMembersFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/requesting/RequestingMembersFragment.java index 858721698e..332c427507 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/requesting/RequestingMembersFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/requesting/RequestingMembersFragment.java @@ -55,8 +55,7 @@ public class RequestingMembersFragment extends Fragment { requestingMembers.initializeAdapter(getViewLifecycleOwner()); requestingMembers.setRecipientClickListener(recipient -> { - RecipientBottomSheetDialogFragment.create(recipient.getId(), null) - .show(requireActivity().getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG); + RecipientBottomSheetDialogFragment.show(requireActivity().getSupportFragmentManager(), recipient.getId(), null); }); requestingMembers.setAdminActionsListener(new AdminActionsListener() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java index f4e253c897..76bc9be24d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java @@ -175,8 +175,7 @@ public class ReviewCardDialogFragment extends FullScreenDialogFragment { @Override public void onCardClicked(@NonNull ReviewCard card) { - RecipientBottomSheetDialogFragment.create(card.getReviewRecipient().getId(), null) - .show(requireFragmentManager(), null); + RecipientBottomSheetDialogFragment.show(getParentFragmentManager(), card.getReviewRecipient().getId(), null); } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java index 86be03b656..3f5759dfee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java @@ -19,6 +19,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.ViewModelProvider; @@ -41,6 +42,7 @@ import org.thoughtcrime.securesms.recipients.RecipientExporter; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.thoughtcrime.securesms.recipients.ui.about.AboutSheet; +import org.thoughtcrime.securesms.recipients.ui.about.AboutSheetKt; import org.thoughtcrime.securesms.util.BottomSheetUtil; import org.thoughtcrime.securesms.util.ContextUtil; import org.thoughtcrime.securesms.util.SpanUtil; @@ -89,20 +91,23 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF private ButtonStripPreference.ViewHolder buttonStripViewHolder; - public static BottomSheetDialogFragment create(@NonNull RecipientId recipientId, - @Nullable GroupId groupId) - { - Bundle args = new Bundle(); - RecipientBottomSheetDialogFragment fragment = new RecipientBottomSheetDialogFragment(); + public static void show(FragmentManager fragmentManager, @NonNull RecipientId recipientId, @Nullable GroupId groupId) { + Recipient recipient = Recipient.resolved(recipientId); + if (recipient.isSelf()) { + AboutSheet.create(recipient).show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG); + } else { + Bundle args = new Bundle(); + RecipientBottomSheetDialogFragment fragment = new RecipientBottomSheetDialogFragment(); - args.putString(ARGS_RECIPIENT_ID, recipientId.serialize()); - if (groupId != null) { - args.putString(ARGS_GROUP_ID, groupId.toString()); + args.putString(ARGS_RECIPIENT_ID, recipientId.serialize()); + if (groupId != null) { + args.putString(ARGS_GROUP_ID, groupId.toString()); + } + + fragment.setArguments(args); + + fragment.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG); } - - fragment.setArguments(args); - - return fragment; } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt index c2080918e5..efaa23fe02 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt @@ -933,8 +933,7 @@ class StoryViewerPageFragment : private fun onSenderClicked(senderId: RecipientId) { viewModel.setIsDisplayingRecipientBottomSheet(true) RecipientBottomSheetDialogFragment - .create(senderId, null) - .show(childFragmentManager, "BOTTOM") + .show(childFragmentManager, senderId, null) } private fun presentBottomBar(post: StoryPost, replyState: StoryViewerPageState.ReplyState, isReceiptsEnabled: Boolean) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt index dd1401044a..38e5948da6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt @@ -271,8 +271,7 @@ class StoryGroupReplyFragment : onCopyClick = { s -> onCopyClick(s) }, onMentionClick = { recipientId -> RecipientBottomSheetDialogFragment - .create(recipientId, null) - .show(childFragmentManager, null) + .show(childFragmentManager, recipientId, null) }, onDeleteClick = { m -> onDeleteClick(m) }, onTapForDetailsClick = { m -> onTapForDetailsClick(m) }