From 26947bb8659a763a9545cf4d76898aa68df10ab5 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 21 Sep 2018 11:25:18 +0200 Subject: [PATCH] let getTimestamp() functions return usual timestamp that are compatibe with the standard Date() object (by converting s to ms) --- jni/dc_wrapper.c | 7 ++++--- .../securesms/connect/ApplicationDcContext.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 34110ae11..46478324c 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -65,6 +65,7 @@ static jstring jstring_new__(JNIEnv* env, const char* a) return ret; } +#define JTIMESTAMP(a) (((jlong)a)*((jlong)1000)) static jintArray dc_array2jintArray_n_unref(JNIEnv *env, dc_array_t* ca) { @@ -897,7 +898,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcChat_getDraft(JNIEnv *env, jobject o JNIEXPORT jlong Java_com_b44t_messenger_DcChat_getDraftTimestamp(JNIEnv *env, jobject obj) { - return (jlong)dc_chat_get_draft_timestamp(get_dc_chat(env, obj)); + return JTIMESTAMP(dc_chat_get_draft_timestamp(get_dc_chat(env, obj))); } @@ -986,7 +987,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getText(JNIEnv *env, jobject obj JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getTimestamp(JNIEnv *env, jobject obj) { - return (jlong)dc_msg_get_timestamp(get_dc_msg(env, obj)); + return JTIMESTAMP(dc_msg_get_timestamp(get_dc_msg(env, obj))); } @@ -1312,7 +1313,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcLot_getText2(JNIEnv *env, jobject ob JNIEXPORT jlong Java_com_b44t_messenger_DcLot_getTimestamp(JNIEnv *env, jobject obj) { - return dc_lot_get_timestamp(get_dc_lot(env, obj)); + return JTIMESTAMP(dc_lot_get_timestamp(get_dc_lot(env, obj))); } diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java index 11f8fe59b..a75c8360d 100644 --- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java +++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java @@ -128,7 +128,7 @@ public class ApplicationDcContext extends DcContext { body += summary.getText2(); Recipient recipient = getRecipient(chat); - long date = summary.getTimestamp()*1000; + long date = summary.getTimestamp(); long count = 1; int unreadCount = getFreshMsgCount(chatId); long type = 0;//cursor.getLong(cursor.getColumnIndexOrThrow(ThreadDatabase.SNIPPET_TYPE));