Skip to content

Commit 885d218

Browse files
committed
add pseudo msg id for private ngc messages
1 parent f220c9c commit 885d218

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

jni-c-toxcore/jni-c-toxcore.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2905,7 +2905,7 @@ void Java_com_zoffcc_applications_trifa_MainActivity_init__real(JNIEnv *env, job
29052905
android_tox_callback_group_message_cb_method = (*env)->GetStaticMethodID(env, MainActivity,
29062906
"android_tox_callback_group_message_cb_method", "(JJILjava/lang/String;JJ)V");
29072907
android_tox_callback_group_private_message_cb_method = (*env)->GetStaticMethodID(env, MainActivity,
2908-
"android_tox_callback_group_private_message_cb_method", "(JJILjava/lang/String;J)V");
2908+
"android_tox_callback_group_private_message_cb_method", "(JJILjava/lang/String;JJ)V");
29092909
android_tox_callback_group_invite_cb_method = (*env)->GetStaticMethodID(env, MainActivity,
29102910
"android_tox_callback_group_invite_cb_method", "(J[BJLjava/lang/String;)V");
29112911
android_tox_callback_group_peer_join_cb_method = (*env)->GetStaticMethodID(env, MainActivity,
@@ -8402,7 +8402,7 @@ Java_com_zoffcc_applications_trifa_MainActivity_tox_1group_1send_1private_1messa
84028402
return (jlong)-22;
84038403
}
84048404

8405-
bool res;
8405+
int64_t res;
84068406
Tox_Err_Group_Send_Private_Message error;
84078407

84088408
#ifdef JAVA_LINUX
@@ -8486,7 +8486,7 @@ Java_com_zoffcc_applications_trifa_MainActivity_tox_1group_1send_1private_1messa
84868486
}
84878487
else
84888488
{
8489-
return (jlong)0;
8489+
return (jlong)res;
84908490
}
84918491
#endif
84928492
}
@@ -8506,7 +8506,7 @@ Java_com_zoffcc_applications_trifa_MainActivity_tox_1group_1send_1private_1messa
85068506
return (jlong)-22;
85078507
}
85088508

8509-
bool res;
8509+
int64_t res;
85108510
Tox_Err_Group_Send_Private_Message error;
85118511

85128512

@@ -8636,7 +8636,7 @@ Java_com_zoffcc_applications_trifa_MainActivity_tox_1group_1send_1private_1messa
86368636
}
86378637
else
86388638
{
8639-
return (jlong)0;
8639+
return (jlong)res;
86408640
}
86418641
#endif
86428642
}
@@ -8661,22 +8661,23 @@ void group_message_cb(Tox *tox, uint32_t group_number, uint32_t peer_id, Tox_Mes
86618661
}
86628662

86638663
void android_tox_callback_group_private_message_cb(uint32_t group_number, uint32_t peer_id, Tox_Message_Type type,
8664-
const uint8_t *message, size_t length)
8664+
const uint8_t *message, size_t length, uint32_t message_id)
86658665
{
86668666
JNIEnv *jnienv2;
86678667
jnienv2 = jni_getenv();
86688668
jstring js1 = c_safe_string_from_java((char *)message, length);
86698669
(*jnienv2)->CallStaticVoidMethod(jnienv2, MainActivity,
86708670
android_tox_callback_group_private_message_cb_method, (jlong)(unsigned long long)group_number,
86718671
(jlong)(unsigned long long)peer_id,
8672-
(jint) type, js1, (jlong)(unsigned long long)length);
8672+
(jint) type, js1, (jlong)(unsigned long long)length,
8673+
(jlong)message_id);
86738674
(*jnienv2)->DeleteLocalRef(jnienv2, js1);
86748675
}
86758676

86768677
void group_private_message_cb(Tox *tox, uint32_t group_number, uint32_t peer_id, Tox_Message_Type type,
8677-
const uint8_t *message, size_t length, void *user_data)
8678+
const uint8_t *message, size_t length, uint32_t message_id, void *user_data)
86788679
{
8679-
android_tox_callback_group_private_message_cb(group_number, peer_id, type, message, length);
8680+
android_tox_callback_group_private_message_cb(group_number, peer_id, type, message, length, message_id);
86808681
}
86818682

86828683

0 commit comments

Comments
 (0)