From 1b9e2c4da30ba317a3b43da8370affb4e017ae53 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 30 Nov 2019 20:40:47 +0100 Subject: [PATCH] add provider-info api --- jni/dc_wrapper.c | 84 ++++++++++++++++++++++++++ src/com/b44t/messenger/DcContext.java | 4 ++ src/com/b44t/messenger/DcProvider.java | 28 +++++++++ 3 files changed, 116 insertions(+) create mode 100644 src/com/b44t/messenger/DcProvider.java diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 4205c1a40..b7bf9c6c6 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -848,6 +848,24 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_deleteAllLocations(JNIEnv *env, } +JNIEXPORT jlong Java_com_b44t_messenger_DcContext_getProviderFromDomainCPtr(JNIEnv *env, jobject obj, jstring domain) +{ + CHAR_REF(domain); + jlong ret = (jlong)dc_provider_new_from_domain(domainPtr); + CHAR_UNREF(domain); + return ret; +} + + +JNIEXPORT jlong Java_com_b44t_messenger_DcContext_getProviderFromEmailCPtr(JNIEnv *env, jobject obj, jstring email) +{ + CHAR_REF(email); + jlong ret = (jlong)dc_provider_new_from_email(emailPtr); + CHAR_UNREF(email); + return ret; +} + + /******************************************************************************* * DcArray ******************************************************************************/ @@ -1553,6 +1571,72 @@ JNIEXPORT void Java_com_b44t_messenger_DcLot_unrefLotCPtr(JNIEnv *env, jobject o } +/******************************************************************************* + * DcProvider + ******************************************************************************/ + + +static dc_provider_t* get_dc_provider(JNIEnv *env, jobject obj) +{ + static jfieldID fid = 0; + if (fid==0) { + jclass cls = (*env)->GetObjectClass(env, obj); + fid = (*env)->GetFieldID(env, cls, "providerCPtr", "J" /*Signature, J=long*/); + } + if (fid) { + return (dc_provider_t*)(*env)->GetLongField(env, obj, fid); + } + return NULL; +} + + +JNIEXPORT void Java_com_b44t_messenger_DcProvider_unrefProviderCPtr(JNIEnv *env, jobject obj) +{ + dc_provider_unref(get_dc_provider(env, obj)); +} + + +JNIEXPORT jstring Java_com_b44t_messenger_DcProvider_getName(JNIEnv *env, jobject obj) +{ + char* temp = dc_provider_get_name(get_dc_provider(env, obj)); + jstring ret = JSTRING_NEW(temp); + dc_str_unref(temp); + return ret; +} + + +JNIEXPORT jint Java_com_b44t_messenger_DcProvider_getStatus(JNIEnv *env, jobject obj) +{ + return (jint)dc_provider_get_status(get_dc_provider(env, obj)); +} + + +JNIEXPORT jstring Java_com_b44t_messenger_DcProvider_getStatusDate(JNIEnv *env, jobject obj) +{ + char* temp = dc_provider_get_status_date(get_dc_provider(env, obj)); + jstring ret = JSTRING_NEW(temp); + dc_str_unref(temp); + return ret; +} + + +JNIEXPORT jstring Java_com_b44t_messenger_DcProvider_getMarkdown(JNIEnv *env, jobject obj) +{ + char* temp = dc_provider_get_markdown(get_dc_provider(env, obj)); + jstring ret = JSTRING_NEW(temp); + dc_str_unref(temp); + return ret; +} + + +JNIEXPORT jstring Java_com_b44t_messenger_DcProvider_getOverviewPage(JNIEnv *env, jobject obj) +{ + char* temp = dc_provider_get_overview_page(get_dc_provider(env, obj)); + jstring ret = JSTRING_NEW(temp); + dc_str_unref(temp); + return ret; +} + /******************************************************************************* * Tools ******************************************************************************/ diff --git a/src/com/b44t/messenger/DcContext.java b/src/com/b44t/messenger/DcContext.java index 13dbaf79a..55908daed 100644 --- a/src/com/b44t/messenger/DcContext.java +++ b/src/com/b44t/messenger/DcContext.java @@ -165,6 +165,8 @@ public class DcContext { public native boolean isSendingLocationsToChat(int chat_id); public @NonNull 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 @Nullable DcProvider getProviderFromDomain(String email) { long cptr = getProviderFromDomainCPtr(email); return cptr!=0 ? new DcProvider(cptr) : null; } + public @Nullable DcProvider getProviderFromEmail (String email) { long cptr = getProviderFromEmailCPtr(email); return cptr!=0 ? new DcProvider(cptr) : null; } /** * @return true if at least one chat has location streaming enabled @@ -192,4 +194,6 @@ public class DcContext { private native long getContactCPtr (int id); private native long getLocationsCPtr (int chat_id, int contact_id, long timestamp_start, long timestamp_end); private native long checkQrCPtr (String qr); + private native long getProviderFromDomainCPtr (String qr); + private native long getProviderFromEmailCPtr (String qr); } diff --git a/src/com/b44t/messenger/DcProvider.java b/src/com/b44t/messenger/DcProvider.java new file mode 100644 index 000000000..0e5f17144 --- /dev/null +++ b/src/com/b44t/messenger/DcProvider.java @@ -0,0 +1,28 @@ +package com.b44t.messenger; + +public class DcProvider { + + public final static int DC_PROVIDER_STATUS_OK = 1; + public final static int DC_PROVIDER_STATUS_PREPARATION = 2; + public final static int DC_PROVIDER_STATUS_BROKEN = 3; + + public DcProvider(long providerCPtr) { + this.providerCPtr = providerCPtr; + } + + @Override protected void finalize() throws Throwable { + super.finalize(); + unrefProviderCPtr(); + providerCPtr = 0; + } + + public native String getName (); + public native int getStatus (); + public native String getStatusDate (); + public native String getMarkdown (); + public native String getOverviewPage(); + + // working with raw c-data + private long providerCPtr; // CAVE: the name is referenced in the JNI + private native void unrefProviderCPtr(); +}