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

Merge remote-tracking branch 'upstream/master' into lite

Browse Source
This commit is contained in:
adbenitez
2021-01-26 14:45:42 -05:00
parent 45d5cd7667 3130b8093b
commit 1d775843ab
5 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/dc_wrapper.c
-9
View File
@@ -1477,15 +1477,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getDisplayName(JNIEnv *env,
}
JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getFirstName(JNIEnv *env, jobject obj)
{
char* temp = dc_contact_get_first_name(get_dc_contact(env, obj));
jstring ret = JSTRING_NEW(temp);
dc_str_unref(temp);
return ret;
}
JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getAddr(JNIEnv *env, jobject obj)
{
char* temp = dc_contact_get_addr(get_dc_contact(env, obj));
src/com/b44t/messenger/DcContact.java
-1
View File
@@ -50,7 +50,6 @@ public class DcContact {
public native int getId ();
public native String getName ();
public native String getDisplayName ();
public native String getFirstName ();
public native String getAddr ();
public native String getNameNAddr ();
public native String getProfileImage();
src/org/thoughtcrime/securesms/ConversationVideochatItem.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class ConversationVideochatItem extends LinearLayout
DcContact dcContact = dcContext.getContact(dcMsg.getFromId());
CharSequence line1 = dcMsg.isOutgoing()? getContext().getString(R.string.videochat_you_invited_hint) :
getContext().getString(R.string.videochat_contact_invited_hint, dcContact.getFirstName());
getContext().getString(R.string.videochat_contact_invited_hint, dcContact.getDisplayName());
CharSequence line2 = Util.getBoldedString(dcMsg.isOutgoing()? getContext().getString(R.string.videochat_tap_to_open) :
getContext().getString(R.string.videochat_tap_to_join));
src/org/thoughtcrime/securesms/map/GenerateInfoWindowTask.java
+1 -1
View File
@@ -96,7 +96,7 @@ class GenerateInfoWindowTask extends AsyncTask<Feature, Bitmap, Bitmap> {
DcContact contact = DcHelper.getContext(callbackRef.get().getContext()).getContact(contactId);
TextView contactTextView = bubbleLayout.findViewById(R.id.message_sender);
contactTextView.setText(contact.getFirstName());
contactTextView.setText(contact.getDisplayName());
String msgText;
if (messageId != 0) {
src/org/thoughtcrime/securesms/notifications/NotificationCenter.java
+2 -2
View File
@@ -331,7 +331,7 @@ public class NotificationCenter {
DcMsg dcMsg = dcContext.getMsg(msgId);
String line = privacy.isDisplayMessage()? dcMsg.getSummarytext(2000) : context.getString(R.string.notify_new_message);
if (dcChat.isGroup() && privacy.isDisplayContact()) {
line = dcContext.getContact(dcMsg.getFromId()).getFirstName() + ": " + line;
line = dcContext.getContact(dcMsg.getFromId()).getDisplayName() + ": " + line;
}
// play signal?
@@ -368,7 +368,7 @@ public class NotificationCenter {
// prepend the sender in the ticker also for one-to-one chats (for group-chats, this is already done)
String tickerLine = line;
if (!dcChat.isGroup() && privacy.isDisplayContact()) {
line = dcContext.getContact(dcMsg.getFromId()).getFirstName() + ": " + line;
line = dcContext.getContact(dcMsg.getFromId()).getDisplayName() + ": " + line;
}
builder.setTicker(tickerLine);