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

adapt to new API

Browse source
This commit is contained in:
B. Petersen 2018-10-07 18:27:59 +02:00
parent 28763e686d
commit 11eed61019
4 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
jni/dc_wrapper.c
View file

@ -499,9 +499,9 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcContext_getMsgCPtr(JNIEnv *env, jobjec
} }
JNIEXPORT jlong Java_com_b44t_messenger_DcContext_createMsgCPtr(JNIEnv *env, jobject obj) JNIEXPORT jlong Java_com_b44t_messenger_DcContext_createMsgCPtr(JNIEnv *env, jobject obj, jint viewtype)
{ {
return (jlong)dc_msg_new(get_dc_context(env, obj)); return (jlong)dc_msg_new(get_dc_context(env, obj), viewtype);
} }
@ -964,7 +964,7 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getTimestamp(JNIEnv *env, jobject
JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getType(JNIEnv *env, jobject obj) JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getType(JNIEnv *env, jobject obj)
{ {
return dc_msg_get_type(get_dc_msg(env, obj)); return dc_msg_get_viewtype(get_dc_msg(env, obj));
} }
@ -1105,12 +1105,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getSetupCodeBegin(JNIEnv *env, j
} }
JNIEXPORT void Java_com_b44t_messenger_DcMsg_setType(JNIEnv *env, jobject obj, int type)
{
dc_msg_set_type(get_dc_msg(env, obj), type);
}
JNIEXPORT void Java_com_b44t_messenger_DcMsg_setText(JNIEnv *env, jobject obj, jstring text) JNIEXPORT void Java_com_b44t_messenger_DcMsg_setText(JNIEnv *env, jobject obj, jstring text)
{ {
CHAR_REF(text); CHAR_REF(text);

2
src/com/b44t/messenger/DcContext.java
View file

@ -166,7 +166,7 @@ public class DcContext {
// working with raw c-data // working with raw c-data
private long contextCPtr; // CAVE: the name is referenced in the JNI private long contextCPtr; // CAVE: the name is referenced in the JNI
private native long createContextCPtr(String osName); private native long createContextCPtr(String osName);
public native long createMsgCPtr (); public native long createMsgCPtr (int viewtype);
private native long getChatlistCPtr (int listflags, String query, int queryId); private native long getChatlistCPtr (int listflags, String query, int queryId);
private native long getChatCPtr (int chat_id); private native long getChatCPtr (int chat_id);
private native long getMsgCPtr (int id); private native long getMsgCPtr (int id);

5
src/com/b44t/messenger/DcMsg.java
View file

@ -57,8 +57,8 @@ public class DcMsg {
public final static int DC_MSG_ID_MARKER1 = 1; public final static int DC_MSG_ID_MARKER1 = 1;
public final static int DC_MSG_ID_DAYMARKER = 9; public final static int DC_MSG_ID_DAYMARKER = 9;
public DcMsg(DcContext context) { public DcMsg(DcContext context, int viewtype) {
msgCPtr = context.createMsgCPtr(); msgCPtr = context.createMsgCPtr(viewtype);
} }
public DcMsg(long msgCPtr) { public DcMsg(long msgCPtr) {
@ -107,7 +107,6 @@ public class DcMsg {
public native boolean isSetupMessage (); public native boolean isSetupMessage ();
public native String getSetupCodeBegin (); public native String getSetupCodeBegin ();
public native boolean isIncreation (); public native boolean isIncreation ();
public native void setType (int type);
public native void setText (String text); public native void setText (String text);
public native void setFile (String file, String filemime); public native void setFile (String file, String filemime);
public native void setDimension (int width, int height); public native void setDimension (int width, int height);

2
src/org/thoughtcrime/securesms/ConversationFragment.java
View file

@ -345,7 +345,7 @@ public class ConversationFragment extends Fragment
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
DcMsg prevMsg = new DcMsg(dcContext); DcMsg prevMsg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
for (DcMsg msg : dcMsgsList) { for (DcMsg msg : dcMsgsList) {
if (result.length()>0) { if (result.length()>0) {
result.append("\n\n"); result.append("\n\n");