Skip to content

Commit

Permalink
remove unused DcHttpResponse and related functions
Browse files Browse the repository at this point in the history
they are replaced by jsonrpc in #2479
  • Loading branch information
r10s committed Sep 25, 2023
1 parent 6bda2b2 commit f57a659
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 93 deletions.
69 changes: 0 additions & 69 deletions jni/dc_wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -1026,15 +1026,6 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcContext_getProviderFromEmailWithDnsCPt
}


JNIEXPORT jlong Java_com_b44t_messenger_DcContext_getHttpResponseCPtr(JNIEnv *env, jobject obj, jstring url)
{
CHAR_REF(url);
jlong ret = (jlong)dc_get_http_response(get_dc_context(env, obj), urlPtr);
CHAR_UNREF(url);
return ret;
}


/*******************************************************************************
* DcEventEmitter
******************************************************************************/
Expand Down Expand Up @@ -2083,66 +2074,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcProvider_getOverviewPage(JNIEnv *env
}


/*******************************************************************************
* DcHttpResponse
******************************************************************************/


static dc_http_response_t* get_dc_http_response(JNIEnv *env, jobject obj)
{
static jfieldID fid = 0;
if (fid==0) {
jclass cls = (*env)->GetObjectClass(env, obj);
fid = (*env)->GetFieldID(env, cls, "httpResponseCPtr", "J" /*Signature, J=long*/);
}
if (fid) {
return (dc_http_response_t*)(*env)->GetLongField(env, obj, fid);
}
return NULL;
}


JNIEXPORT void Java_com_b44t_messenger_DcHttpResponse_unrefHttpResponseCPtr(JNIEnv *env, jobject obj)
{
dc_http_response_unref(get_dc_http_response(env, obj));
}


JNIEXPORT jstring Java_com_b44t_messenger_DcHttpResponse_getMimetype(JNIEnv *env, jobject obj)
{
char* temp = dc_http_response_get_mimetype(get_dc_http_response(env, obj));
jstring ret = NULL;
if (temp) {
ret = JSTRING_NEW(temp);
}
dc_str_unref(temp);
return ret;
}


JNIEXPORT jstring Java_com_b44t_messenger_DcHttpResponse_getEncoding(JNIEnv *env, jobject obj)
{
char* temp = dc_http_response_get_encoding(get_dc_http_response(env, obj));
jstring ret = NULL;
if (temp) {
ret = JSTRING_NEW(temp);
}
dc_str_unref(temp);
return ret;
}


JNIEXPORT jbyteArray Java_com_b44t_messenger_DcHttpResponse_getBlob(JNIEnv *env, jobject obj)
{
jbyteArray ret = NULL;
dc_http_response_t* http_response = get_dc_http_response(env, obj);
size_t ptr_size = dc_http_response_get_size(http_response);
uint8_t* ptr = dc_http_response_get_blob(http_response);
ret = ptr2jbyteArray(env, ptr, ptr_size);
dc_str_unref((char*)ptr);
return ret;
}

/*******************************************************************************
* DcJsonrpcInstance
******************************************************************************/
Expand Down
2 changes: 0 additions & 2 deletions src/com/b44t/messenger/DcContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ public void unref() {
public DcArray getLocations (int chat_id, int contact_id, long timestamp_start, long timestamp_end) { return new DcArray(getLocationsCPtr(chat_id, contact_id, timestamp_start, timestamp_end)); }
public native void deleteAllLocations ();
public DcProvider getProviderFromEmailWithDns (String email) { long cptr = getProviderFromEmailWithDnsCPtr(email); return cptr!=0 ? new DcProvider(cptr) : null; }
public DcHttpResponse getHttpResponse (String url) { long cptr = getHttpResponseCPtr(url); return cptr!=0 ? new DcHttpResponse(cptr) : null; }

public String getNameNAddr() {
String displayname = getConfig("displayname");
Expand Down Expand Up @@ -256,5 +255,4 @@ public String getNameNAddr() {
private native long checkQrCPtr (String qr);
private native long getProviderFromEmailWithDnsCPtr (String addr);
private native long newBackupProviderCPtr();
private native long getHttpResponseCPtr(String url);
}
22 changes: 0 additions & 22 deletions src/com/b44t/messenger/DcHttpResponse.java

This file was deleted.

0 comments on commit f57a659

Please sign in to comment.