From e2d7f2c3d32f5e0b7133c9416def14b71eba2a12 Mon Sep 17 00:00:00 2001 From: bjoern Date: Wed, 2 Apr 2025 16:41:36 +0200 Subject: [PATCH] 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 --------- Co-authored-by: adb --- CHANGELOG.md | 2 ++ jni/dc_wrapper.c | 9 --------- .../java/com/b44t/messenger/DcContact.java | 1 - .../securesms/ConversationActivity.java | 2 +- .../securesms/NewConversationActivity.java | 4 ++-- .../securesms/qr/QrCodeHandler.java | 20 +++++++++---------- .../securesms/qr/QrShowFragment.java | 6 +++--- .../securesms/search/SearchFragment.java | 2 +- .../securesms/util/LongClickCopySpan.java | 2 +- 9 files changed, 20 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1618222af..fe0b2d7f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Unreleased * hide superfluous "Show Classic E-mails" advanced setting for chatmail +* remove mostly non-telling transport addresses when referring to a contact; + the contact's profile gives a much better overview ## v1.56.1 2025-03 diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 918b95afd..b54116fc3 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -1773,15 +1773,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getAddr(JNIEnv *env, jobject } -JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getNameNAddr(JNIEnv *env, jobject obj) -{ - char* temp = dc_contact_get_name_n_addr(get_dc_contact(env, obj)); - jstring ret = JSTRING_NEW(temp); - dc_str_unref(temp); - return ret; -} - - JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getProfileImage(JNIEnv *env, jobject obj) { char* temp = dc_contact_get_profile_image(get_dc_contact(env, obj)); diff --git a/src/main/java/com/b44t/messenger/DcContact.java b/src/main/java/com/b44t/messenger/DcContact.java index 4d3df6f38..13f55f993 100644 --- a/src/main/java/com/b44t/messenger/DcContact.java +++ b/src/main/java/com/b44t/messenger/DcContact.java @@ -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 (); diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index f0db43f5b..8883b61f6 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -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) diff --git a/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java index efea8dc4d..b4f7dce4a 100644 --- a/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java @@ -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) -> { diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java index 25e430456..d43f061e4 100644 --- a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java +++ b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java @@ -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); diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java index 089eae278..0b846319c 100644 --- a/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java @@ -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) { diff --git a/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java b/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java index 7fa35f418..5f88ab463 100644 --- a/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java @@ -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) -> { diff --git a/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java b/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java index b86e486cf..6da6511cf 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java +++ b/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java @@ -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); })