prefer NAME over NAME (ADDR) (#3699)

* prefer NAME over NAME (ADDR)

this tunes the usage of email addresses further down,
in all cases, the profile should only be a tap away before or afterwards,
so, these mentionings were never really critical

* update CHANGELOG

* Update CHANGELOG.md

Co-authored-by: adb <adb@merlinux.eu>

---------

Co-authored-by: adb <adb@merlinux.eu>
This commit is contained in:
bjoern
2025-04-02 16:41:36 +02:00
committed by GitHub
parent 6996836f80
commit e2d7f2c3d3
9 changed files with 20 additions and 28 deletions
@@ -50,7 +50,6 @@ public class DcContact {
public native String getAuthName ();
public native String getDisplayName ();
public native String getAddr ();
public native String getNameNAddr ();
public native String getProfileImage();
public native int getColor ();
public native String getStatus ();
@@ -680,7 +680,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (!dcChat.isMultiUser()) {
int[] contactIds = dcContext.getChatContacts(chatId);
if (contactIds.length == 1 || contactIds.length == 2) {
name = dcContext.getContact(contactIds[0]).getNameNAddr();
name = dcContext.getContact(contactIds[0]).getDisplayName();
}
}
new AlertDialog.Builder(this)
@@ -114,9 +114,9 @@ public class NewConversationActivity extends ContactSelectionActivity {
if (dcContext.getChatIdByContactId(contactId)!=0) {
openConversation(dcContext.getChatIdByContactId(contactId));
} else {
String nameNAddr = dcContext.getContact(contactId).getNameNAddr();
String name = dcContext.getContact(contactId).getDisplayName();
new AlertDialog.Builder(this)
.setMessage(getString(R.string.ask_start_chat_with, nameNAddr))
.setMessage(getString(R.string.ask_start_chat_with, name))
.setCancelable(true)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
@@ -39,11 +39,11 @@ public class QrCodeHandler {
public void handleQrData(String rawString) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
final DcLot qrParsed = dcContext.checkQr(rawString);
String nameAndAddress = dcContext.getContact(qrParsed.getId()).getNameNAddr();
String name = dcContext.getContact(qrParsed.getId()).getDisplayName();
switch (qrParsed.getState()) {
case DcContext.DC_QR_ASK_VERIFYCONTACT:
case DcContext.DC_QR_ASK_VERIFYGROUP:
showVerifyContactOrGroup(activity, builder, rawString, qrParsed, nameAndAddress);
showVerifyContactOrGroup(activity, builder, rawString, qrParsed, name);
break;
case DcContext.DC_QR_FPR_WITHOUT_ADDR:
@@ -51,12 +51,12 @@ public class QrCodeHandler {
break;
case DcContext.DC_QR_FPR_MISMATCH:
showFingerPrintError(builder, nameAndAddress);
showFingerPrintError(builder, name);
break;
case DcContext.DC_QR_FPR_OK:
case DcContext.DC_QR_ADDR:
showFingerprintOrQrSuccess(builder, qrParsed, nameAndAddress);
showFingerprintOrQrSuccess(builder, qrParsed, name);
break;
case DcContext.DC_QR_URL:
@@ -190,9 +190,9 @@ public class QrCodeHandler {
Toast.makeText(activity, activity.getString(R.string.done), Toast.LENGTH_SHORT).show();
}
private void showFingerprintOrQrSuccess(AlertDialog.Builder builder, DcLot qrParsed, String nameAndAddress) {
private void showFingerprintOrQrSuccess(AlertDialog.Builder builder, DcLot qrParsed, String name) {
@StringRes int resId = qrParsed.getState() == DcContext.DC_QR_ADDR ? R.string.ask_start_chat_with : R.string.qrshow_x_verified;
builder.setMessage(activity.getString(resId, nameAndAddress));
builder.setMessage(activity.getString(resId, name));
builder.setPositiveButton(R.string.start_chat, (dialogInterface, i) -> {
int chatId = dcContext.createChatByContactId(qrParsed.getId());
Intent intent = new Intent(activity, ConversationActivity.class);
@@ -205,8 +205,8 @@ public class QrCodeHandler {
builder.setNegativeButton(android.R.string.cancel, null);
}
private void showFingerPrintError(AlertDialog.Builder builder, String nameAndAddress) {
builder.setMessage(activity.getString(R.string.qrscan_fingerprint_mismatch, nameAndAddress));
private void showFingerPrintError(AlertDialog.Builder builder, String name) {
builder.setMessage(activity.getString(R.string.qrscan_fingerprint_mismatch, name));
builder.setPositiveButton(android.R.string.ok, null);
}
@@ -219,14 +219,14 @@ public class QrCodeHandler {
});
}
private void showVerifyContactOrGroup(Activity activity, AlertDialog.Builder builder, String qrRawString, DcLot qrParsed, String nameNAddr) {
private void showVerifyContactOrGroup(Activity activity, AlertDialog.Builder builder, String qrRawString, DcLot qrParsed, String name) {
String msg;
switch (qrParsed.getState()) {
case DcContext.DC_QR_ASK_VERIFYGROUP:
msg = activity.getString(R.string.qrscan_ask_join_group, qrParsed.getText1());
break;
default:
msg = activity.getString(R.string.ask_start_chat_with, nameNAddr);
msg = activity.getString(R.string.ask_start_chat_with, name);
break;
}
builder.setMessage(msg);
@@ -187,12 +187,12 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel
long progress = event.getData2Int();
String msg = null;
if (progress == 300) {
msg = String.format(getString(R.string.qrshow_x_joining), dcContext.getContact(contact_id).getNameNAddr());
msg = String.format(getString(R.string.qrshow_x_joining), dcContext.getContact(contact_id).getDisplayName());
numJoiners++;
} else if (progress == 600) {
msg = String.format(getString(R.string.qrshow_x_verified), dcContext.getContact(contact_id).getNameNAddr());
msg = String.format(getString(R.string.qrshow_x_verified), dcContext.getContact(contact_id).getDisplayName());
} else if (progress == 800) {
msg = String.format(getString(R.string.qrshow_x_has_joined_group), dcContext.getContact(contact_id).getNameNAddr());
msg = String.format(getString(R.string.qrshow_x_has_joined_group), dcContext.getContact(contact_id).getDisplayName());
}
if (msg != null) {
@@ -166,7 +166,7 @@ public class SearchFragment extends BaseConversationListFragment
int chatId = dcContext.getChatIdByContactId(contact.getId());
if(chatId==0) {
new AlertDialog.Builder(requireContext())
.setMessage(getString(R.string.ask_start_chat_with, contact.getNameNAddr()))
.setMessage(getString(R.string.ask_start_chat_with, contact.getDisplayName()))
.setCancelable(true)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
@@ -63,7 +63,7 @@ public class LongClickCopySpan extends ClickableSpan {
openChat(activity, contact);
} else {
new AlertDialog.Builder(activity)
.setMessage(activity.getString(R.string.ask_start_chat_with, contact.getNameNAddr()))
.setMessage(activity.getString(R.string.ask_start_chat_with, contact.getDisplayName()))
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
openChat(activity, contact);
})