From 0f09aba7af9832ec789c6afabf8a548df0708778 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 25 Sep 2023 21:11:04 +0200 Subject: [PATCH] remove unused DcHttpResponse and related functions they are replaced by jsonrpc in https://github.com/deltachat/deltachat-android/pull/2479 --- jni/dc_wrapper.c | 69 ---------------------- src/com/b44t/messenger/DcContext.java | 2 - src/com/b44t/messenger/DcHttpResponse.java | 22 ------- 3 files changed, 93 deletions(-) delete mode 100644 src/com/b44t/messenger/DcHttpResponse.java diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 9d25ef687..ae91ff70a 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -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 ******************************************************************************/ @@ -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 ******************************************************************************/ diff --git a/src/com/b44t/messenger/DcContext.java b/src/com/b44t/messenger/DcContext.java index e0314d584..caa7ca647 100644 --- a/src/com/b44t/messenger/DcContext.java +++ b/src/com/b44t/messenger/DcContext.java @@ -216,7 +216,6 @@ public class DcContext { 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"); @@ -256,5 +255,4 @@ public class DcContext { private native long checkQrCPtr (String qr); private native long getProviderFromEmailWithDnsCPtr (String addr); private native long newBackupProviderCPtr(); - private native long getHttpResponseCPtr(String url); } diff --git a/src/com/b44t/messenger/DcHttpResponse.java b/src/com/b44t/messenger/DcHttpResponse.java deleted file mode 100644 index f41f9cd1c..000000000 --- a/src/com/b44t/messenger/DcHttpResponse.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.b44t.messenger; - -public class DcHttpResponse { - - public DcHttpResponse(long httpResponseCPtr) { - this.httpResponseCPtr = httpResponseCPtr; - } - - @Override protected void finalize() throws Throwable { - super.finalize(); - unrefHttpResponseCPtr(); - httpResponseCPtr = 0; - } - - public native String getMimetype (); - public native String getEncoding (); - public native byte[] getBlob (); - - // working with raw c-data - private long httpResponseCPtr; // CAVE: the name is referenced in the JNI - private native void unrefHttpResponseCPtr(); -}