remove unneeded FROM_SHARE_ACTIVITY_EXTRA

This commit is contained in:
B. Petersen
2023-10-04 23:55:55 +02:00
committed by bjoern
parent 6132737a24
commit 134d7ad4c2
2 changed files with 2 additions and 8 deletions
@@ -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<DcContactsLoader.Ret> 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);
}
@@ -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);
}