awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

do contact creation after confirmed by the user

Browse Source
This commit is contained in:
B. Petersen
2018-09-19 13:29:26 +02:00
parent b16c80f6c5
commit 03f50a1b7c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+2 -1
View File
@@ -299,7 +299,8 @@ public class ContactSelectionListFragment extends Fragment
String addr = contact.getNumber();
if (!isMulti() || !selectedContacts.contains(addr))
{
if(specialId== DcContact.DC_CONTACT_ID_NEW_CONTACT
if (isMulti()
&& specialId== DcContact.DC_CONTACT_ID_NEW_CONTACT
&& dcContext.lookupContactIdByAddr(addr)==0) {
if (dcContext.createContact(null, addr)==0) {
Toast.makeText(getActivity(), R.string.bad_email_address, Toast.LENGTH_LONG).show();
src/org/thoughtcrime/securesms/NewConversationActivity.java
+11 -4
View File
@@ -64,20 +64,27 @@ public class NewConversationActivity extends ContactSelectionActivity {
finish();
}
else {
int contactId = dcContext.lookupContactIdByAddr(addr);
if(contactId==0) {
if(!dcContext.mayBeValidAddr(addr)) {
Toast.makeText(this, R.string.bad_email_address, Toast.LENGTH_LONG).show();
return;
}
DcContact dcContact = dcContext.getContact(contactId);
int contactId = dcContext.lookupContactIdByAddr(addr);
int chatId = dcContext.getChatIdByContactId(contactId);
if (chatId == 0) {
String nameNAddr = contactId==0? addr : dcContext.getContact(contactId).getNameNAddr();
new AlertDialog.Builder(this)
.setMessage(getString(R.string.new_conversation_activity__ask_start_chat_with, dcContact.getNameNAddr()))
.setMessage(getString(R.string.new_conversation_activity__ask_start_chat_with, nameNAddr))
.setCancelable(true)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
int contactId = dcContext.createContact(null, addr);
if(contactId==0) {
Toast.makeText(NewConversationActivity.this, R.string.bad_email_address, Toast.LENGTH_LONG).show();
return;
}
openConversation(dcContext.createChatByContactId(contactId));
}
}).show();