From cd8239df8725c56db956333b5dc29f936bc44485 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 17 Oct 2016 19:56:19 +0200 Subject: [PATCH] Correct From-ID. --- TMessagesProj/jni/mr_wrapper.c | 13 +++++++++++++ .../java/org/telegram/messenger/MrMailbox.java | 15 +++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/TMessagesProj/jni/mr_wrapper.c b/TMessagesProj/jni/mr_wrapper.c index e70b73657..9a51b10cc 100644 --- a/TMessagesProj/jni/mr_wrapper.c +++ b/TMessagesProj/jni/mr_wrapper.c @@ -472,6 +472,17 @@ JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrPoortextGetState(JNIEnv * ******************************************************************************/ +JNIEXPORT jstring Java_org_telegram_messenger_MrMailbox_CPtr2String(JNIEnv *env, jclass c, jlong hStr) +{ + /* the callback may return a long that represents a pointer to a C-String; this function creates a Java-string from such values. */ + if( hStr == 0 ) { + return NULL; + } + const char* ptr = (const char*)hStr; + return JSTRING_NEW(ptr); +} + + JNIEXPORT void Java_org_telegram_messenger_MrMailbox_MrStockAddStr(JNIEnv* env, jclass c, jint id, jstring str) { CHAR_REF(str); @@ -490,3 +501,5 @@ JNIEXPORT jstring Java_org_telegram_messenger_MrMailbox_MrGetVersionStr(JNIEnv * } + + diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java index e77d46aff..cb0e24d1a 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java @@ -63,10 +63,7 @@ public class MrMailbox { // TLRPC.TL_messageService is used to display messages as "You joined the group" // TLRPC.TL_message is a normal message (also photos?) - ret.from_id = (int)MrMailbox.MrMsgGetFromId(hMsg); - if( ret.from_id == 0 ) { - ret.from_id = 1; // from us - } + ret.from_id = (int)MrMailbox.MrMsgGetFromId(hMsg); // 1=from us ret.to_id = new TLRPC.TL_peerUser(); ret.to_id.user_id = -1; // to chat @@ -74,7 +71,7 @@ public class MrMailbox { ret.message = MrMailbox.MrMsgGetText(hMsg); ret.date = (int)MrMsgGetTimestamp(hMsg); - // MessageObject.contentType - ? + // MessageObject.contentType - ?? return ret; } @@ -86,7 +83,8 @@ public class MrMailbox { } // this function is called from within the C-wrapper - public final static int MR_EVENT_MSGS_UPDATED = 2000; + public final static int MR_EVENT_MSGS_UPDATED = 2000; + public final static int MR_EVENT_IS_EMAIL_KNOWN = 2010; public static long MrCallback(int event, long data1, long data2) { switch(event) { @@ -101,6 +99,10 @@ public class MrMailbox { } }); return 0; + + case MR_EVENT_IS_EMAIL_KNOWN: + String emailAdr = CPtr2String(data1); + return 0; } return 0; } @@ -169,6 +171,7 @@ public class MrMailbox { // Tools public native static void MrStockAddStr (int id, String str); public native static String MrGetVersionStr (); + public native static String CPtr2String (long hString); // get strings eg. from data1 from the callback public final static int MR_CHAT_UNDEFINED = 0; public final static int MR_CHAT_NORMAL = 100;