mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
add 'Scan QR Code' option to 'New Chat'
This commit is contained in:
@@ -86,7 +86,7 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
|
||||
|
||||
@Override
|
||||
public Loader<DcContactsLoader.Ret> 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
|
||||
|
||||
@@ -281,12 +281,13 @@ public class ContactSelectionListFragment extends Fragment
|
||||
|
||||
@Override
|
||||
public Loader<DcContactsLoader.Ret> 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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -16,14 +16,16 @@ public class DcContactsLoader extends AsyncLoader<DcContactsLoader.Ret> {
|
||||
|
||||
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<DcContactsLoader.Ret> {
|
||||
|
||||
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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user