yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

render saved messages accordingly

Browse source
This commit is contained in:
B. Petersen 2025-02-02 12:29:43 +01:00 • committed by adb
parent 0eb02b59a3
commit 0704f7f1e7
4 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
jni/dc_wrapper.c
View file

@ -1688,6 +1688,15 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getParentCPtr(JNIEnv *env, jobject
return (jlong)dc_msg_get_parent(get_dc_msg(env, obj));
}
JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getOriginalMsgId(JNIEnv *env, jobject obj)
{
return (jint)dc_msg_get_original_msg_id(get_dc_msg(env, obj));
}
JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getSavedMsgId(JNIEnv *env, jobject obj)
{
return (jint)dc_msg_get_saved_msg_id(get_dc_msg(env, obj));
}
JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getError(JNIEnv *env, jobject obj)
{

11
src/main/java/com/b44t/messenger/DcMsg.java
View file

@ -185,6 +185,17 @@ public class DcMsg {
return cPtr != 0 ? new DcMsg(cPtr) : null;
}
public native int getOriginalMsgId ();
public native int getSavedMsgId ();
public boolean canSave() {
return !isInfo();
}
public boolean isSaved() {
return getOriginalMsgId() != 0 || getSavedMsgId() != 0;
}
public File getFileAsFile() {
if(getFile()==null)
throw new AssertionError("expected a file to be present.");

2
src/main/java/org/thoughtcrime/securesms/ConversationItem.java
View file

@ -175,7 +175,7 @@ public class ConversationItem extends BaseConversationItem
{
bind(messageRecord, dcChat, batchSelected, pulseHighlight, recipients);
this.glideRequests = glideRequests;
this.showSender = (dcChat.isMultiUser() && !messageRecord.isOutgoing()) || messageRecord.getOverrideSenderName() != null;
this.showSender = ((dcChat.isMultiUser() || dcChat.isSelfTalk()) && !messageRecord.isOutgoing()) || messageRecord.getOverrideSenderName() != null;
if (showSender) {
this.dcContact = dcContext.getContact(messageRecord.getFromId());

6
src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
View file

@ -72,7 +72,11 @@ public class ConversationItemFooter extends LinearLayout {
private void presentDate(@NonNull DcMsg messageRecord) {
dateView.forceLayout();
dateView.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), messageRecord.getTimestamp()));
String text = DateUtils.getExtendedRelativeTimeSpanString(getContext(), messageRecord.getTimestamp());
if (messageRecord.isSaved()) {
text += " ★";
}
dateView.setText(text);
}
private void presentDeliveryStatus(@NonNull DcMsg messageRecord) {