From 4cd42e73a0777140a36ed12fb490c64a95513b60 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 10 Jan 2024 23:26:53 +0100 Subject: [PATCH] add 'Scan QR Code' option to 'New Chat' --- .../securesms/BlockedContactsActivity.java | 2 +- .../securesms/ContactSelectionListFragment.java | 11 ++++++----- .../securesms/NewConversationActivity.java | 4 ++++ .../securesms/connect/DcContactsLoader.java | 13 +++++++++++-- .../contacts/ContactSelectionListAdapter.java | 2 ++ 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java index 1abd9027c..6b2fdf505 100644 --- a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java +++ b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java @@ -86,7 +86,7 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity @Override public Loader onCreateLoader(int id, Bundle args) { - return new DcContactsLoader(getActivity(), -1, null, false, false, true); + return new DcContactsLoader(getActivity(), -1, null, false, false, false, true); } @Override diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java index 8d5fe1768..791c80305 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -281,12 +281,13 @@ public class ContactSelectionListFragment extends Fragment @Override public Loader onCreateLoader(int id, Bundle args) { - boolean allowCreation = getActivity().getIntent().getBooleanExtra(ALLOW_CREATION, true); - boolean addCreateContactLink = allowCreation && !isSelectVerfied(); - boolean addCreateGroupLinks = allowCreation && !isRelayingMessageContent(getActivity()) && !isMulti(); + final boolean allowCreation = getActivity().getIntent().getBooleanExtra(ALLOW_CREATION, true); + final boolean addCreateContactLink = allowCreation && !isSelectVerfied(); + final boolean addCreateGroupLinks = allowCreation && !isRelayingMessageContent(getActivity()) && !isMulti(); + final boolean addScanQRLink = allowCreation && !isMulti(); - int listflags = DcContext.DC_GCL_ADD_SELF; - return new DcContactsLoader(getActivity(), listflags, cursorFilter, addCreateGroupLinks, addCreateContactLink, false); + final int listflags = DcContext.DC_GCL_ADD_SELF; + return new DcContactsLoader(getActivity(), listflags, cursorFilter, addCreateGroupLinks, addCreateContactLink, addScanQRLink, false); } @Override diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java index c61838e64..49e99882d 100644 --- a/src/org/thoughtcrime/securesms/NewConversationActivity.java +++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java @@ -28,8 +28,10 @@ import androidx.appcompat.app.AlertDialog; import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContext; +import com.google.zxing.integration.android.IntentIntegrator; import org.thoughtcrime.securesms.connect.DcHelper; +import org.thoughtcrime.securesms.qr.QrActivity; import org.thoughtcrime.securesms.util.MailtoUtil; import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA; @@ -95,6 +97,8 @@ public class NewConversationActivity extends ContactSelectionActivity { Intent intent = new Intent(this, GroupCreateActivity.class); intent.putExtra(GroupCreateActivity.CREATE_BROADCAST, true); startActivity(intent); + } else if (specialId == DcContact.DC_CONTACT_ID_QR_INVITE) { + new IntentIntegrator(this).setCaptureActivity(QrActivity.class).initiateScan(); } else { int contactId = dcContext.lookupContactIdByAddr(addr); diff --git a/src/org/thoughtcrime/securesms/connect/DcContactsLoader.java b/src/org/thoughtcrime/securesms/connect/DcContactsLoader.java index 7fdd57f15..03e65135b 100644 --- a/src/org/thoughtcrime/securesms/connect/DcContactsLoader.java +++ b/src/org/thoughtcrime/securesms/connect/DcContactsLoader.java @@ -16,14 +16,16 @@ public class DcContactsLoader extends AsyncLoader { private final int listflags; private final String query; + private final boolean addScanQRLink; private final boolean addCreateGroupLinks; private final boolean addCreateContactLink; private final boolean blockedContacts; - public DcContactsLoader(Context context, int listflags, String query, boolean addCreateGroupLinks, boolean addCreateContactLink, boolean blockedContacts) { + public DcContactsLoader(Context context, int listflags, String query, boolean addCreateGroupLinks, boolean addCreateContactLink, boolean addScanQRLink, boolean blockedContacts) { super(context); this.listflags = listflags; this.query = (query==null||query.isEmpty())? null : query; + this.addScanQRLink = addScanQRLink; this.addCreateGroupLinks = addCreateGroupLinks; this.addCreateContactLink= addCreateContactLink; this.blockedContacts = blockedContacts; @@ -40,12 +42,19 @@ public class DcContactsLoader extends AsyncLoader { int[] contact_ids = dcContext.getContacts(listflags, query); int[] additional_items = new int[0]; - if (addCreateContactLink) additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_CONTACT); + if (query == null && addScanQRLink) + { + additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_QR_INVITE); + } if (query == null && addCreateGroupLinks) { additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_GROUP); final boolean broadcastsEnabled = Prefs.isNewBroadcastListAvailable(getContext()); if (broadcastsEnabled) additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_BROADCAST_LIST); } + if (addCreateContactLink) + { + additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_CONTACT); + } int all_ids[] = new int[contact_ids.length + additional_items.length]; System.arraycopy(additional_items, 0, all_ids, 0, additional_items.length); System.arraycopy(contact_ids, 0, all_ids, additional_items.length, contact_ids.length); diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java index cf7a24e4f..f5f4947c1 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java @@ -278,6 +278,8 @@ public class ContactSelectionListAdapter extends RecyclerView.Adapter name = context.getString(R.string.menu_new_group); } else if (id == DcContact.DC_CONTACT_ID_NEW_BROADCAST_LIST) { name = context.getString(R.string.new_broadcast_list); + } else if (id == DcContact.DC_CONTACT_ID_QR_INVITE) { + name = context.getString(R.string.qrscan_title); } else { dcContact = getContact(i); name = dcContact.getDisplayName();