From 134d7ad4c2d2b6500a430965209987029cdf1572 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 4 Oct 2023 23:55:55 +0200 Subject: [PATCH] remove unneeded FROM_SHARE_ACTIVITY_EXTRA --- .../securesms/ContactSelectionListFragment.java | 9 ++------- src/org/thoughtcrime/securesms/ConversationActivity.java | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java index 71665d5a5..3e2a258da 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -82,7 +82,6 @@ public class ContactSelectionListFragment extends Fragment public static final String MULTI_SELECT = "multi_select"; public static final String SELECT_VERIFIED_EXTRA = "select_verified"; - public static final String FROM_SHARE_ACTIVITY_EXTRA = "from_share_activity"; public static final String ALLOW_CREATION = "allow_creation"; public static final String PRESELECTED_CONTACTS = "preselected_contacts"; @@ -258,10 +257,6 @@ public class ContactSelectionListFragment extends Fragment return getActivity().getIntent().getBooleanExtra(SELECT_VERIFIED_EXTRA, false); } - private boolean isFromShareActivity() { - return getActivity().getIntent().getBooleanExtra(FROM_SHARE_ACTIVITY_EXTRA, false); - } - private void initializeCursor() { ContactSelectionListAdapter adapter = new ContactSelectionListAdapter(getActivity(), GlideApp.with(this), @@ -283,12 +278,12 @@ public class ContactSelectionListFragment extends Fragment @Override public Loader onCreateLoader(int id, Bundle args) { - boolean addCreateGroupLinks = !isFromShareActivity() && !isRelayingMessageContent(getActivity()) && !isMulti(); + boolean allowCreation = getActivity().getIntent().getBooleanExtra(ALLOW_CREATION, true); + boolean addCreateGroupLinks = allowCreation && !isRelayingMessageContent(getActivity()) && !isMulti(); int listflags = DcContext.DC_GCL_ADD_SELF; if(isSelectVerfied()) { listflags = DcContext.DC_GCL_VERIFIED_ONLY; } - boolean allowCreation = getActivity().getIntent().getBooleanExtra(ALLOW_CREATION, true); return new DcContactsLoader(getActivity(), listflags, cursorFilter, addCreateGroupLinks, false, allowCreation); } diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 52f86a938..11cd957ea 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -950,7 +950,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private void startContactChooserActivity() { Intent intent = new Intent(ConversationActivity.this, AttachContactActivity.class); - intent.putExtra(ContactSelectionListFragment.FROM_SHARE_ACTIVITY_EXTRA, true); intent.putExtra(ContactSelectionListFragment.ALLOW_CREATION, false); startActivityForResult(intent, PICK_CONTACT); }