Set correct check marks.

This commit is contained in:
B. Petersen
2016-10-21 01:29:59 +02:00
parent 917dd3c39c
commit fe2bb72fb2
3 changed files with 19 additions and 4 deletions
+7
View File
@@ -395,6 +395,13 @@ JNIEXPORT void Java_org_telegram_messenger_MrMailbox_MrMsgUnref(JNIEnv *env, jcl
}
JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrMsgGetId(JNIEnv *env, jclass c, jlong hMsg)
{
mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return 0; }
return ths->m_id;
}
JNIEXPORT jstring Java_org_telegram_messenger_MrMailbox_MrMsgGetText(JNIEnv *env, jclass c, jlong hMsg)
{
mrmsg_t* ths = (mrmsg_t*)hMsg; if( ths == NULL ) { return JSTRING_NEW(NULL); }
@@ -1246,15 +1246,15 @@ public class MessageObject {
}
public boolean isSending() {
return messageOwner.send_state == MESSAGE_SEND_STATE_SENDING && messageOwner.id < 0;
return messageOwner.send_state == MESSAGE_SEND_STATE_SENDING /*&& messageOwner.id < 0-- EDIT BY MR, the ID is always set by us*/;
}
public boolean isSendError() {
return messageOwner.send_state == MESSAGE_SEND_STATE_SEND_ERROR && messageOwner.id < 0;
return messageOwner.send_state == MESSAGE_SEND_STATE_SEND_ERROR /*&& messageOwner.id < 0-- EDIT BY MR, the ID is always set by us*/;
}
public boolean isSent() {
return messageOwner.send_state == MESSAGE_SEND_STATE_SENT || messageOwner.id > 0;
return messageOwner.send_state == MESSAGE_SEND_STATE_SENT /*|| messageOwner.id > 0 -- EDIT BY MR, the ID is always set by us*/;
}
public String getSecretTimeString() {
@@ -64,14 +64,21 @@ public class MrMailbox {
// TLRPC.TL_message is a normal message (also photos?)
int state = MrMsgGetState(hMsg);
switch( state ) {
case MR_OUT_DELIVERED: ret.send_state = MessageObject.MESSAGE_SEND_STATE_SENT; break;
case MR_OUT_ERROR: ret.send_state = MessageObject.MESSAGE_SEND_STATE_SEND_ERROR; break;
case MR_OUT_PENDING: ret.send_state = MessageObject.MESSAGE_SEND_STATE_SENDING; break;
case MR_OUT_READ: ret.send_state = MessageObject.MESSAGE_SEND_STATE_SENT; break;
}
ret.id = MrMailbox.MrMsgGetId(hMsg);
ret.from_id = MrMailbox.MrMsgGetFromId(hMsg);
ret.to_id = new TLRPC.TL_peerUser();
ret.to_id.user_id = MrMailbox.MrMsgGetToId(hMsg);
ret.message = MrMailbox.MrMsgGetText(hMsg);
ret.date = (int)MrMsgGetTimestamp(hMsg);
ret.dialog_id = MrMsgGetChatId(hMsg);
ret.unread = state==MR_IN_UNREAD;
ret.unread = state!=MR_OUT_READ; // the state of outgoing messages
ret.media_unread = ret.unread;
ret.flags = 0;
ret.post = false; // ? true=avatar wird in gruppen nicht angezeigt
@@ -162,6 +169,7 @@ public class MrMailbox {
// MrMsg objects
public native static void MrMsgUnref (long hMsg);
public native static int MrMsgGetId (long hMsg);
public native static String MrMsgGetText (long hMsg);
public native static long MrMsgGetTimestamp (long hMsg);
public native static int MrMsgGetType (long hMsg);